Merge branch 'master' of https://github.com/dhardtke/javaparser into dhardtke-master

# Conflicts:
#	javaparser-testing/src/test/java/com/github/javaparser/JavadocParserTest.java
#	javaparser-testing/src/test/java/com/github/javaparser/javadoc/JavadocTest.java

2 files changed, 16 insertions, 3 deletions

diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java
index 41ed01bdc..62e1957cc 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java
@@ -109,8 +109,11 @@ public class Javadoc {
         return description;
     }
 
+    /**
+     * @return the current List of associated JavadocBlockTags
+     */
     public List<JavadocBlockTag> getBlockTags() {
-        return blockTags;
+        return this.blockTags;
     }
 
     @Override
diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java
index 2718551b6..82f818a98 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java
@@ -69,8 +69,18 @@ public class JavadocDescription {
         elements = new LinkedList<>();
     }
 
-    public void addElement(JavadocDescriptionElement element) {
-        this.elements.add(element);
+    public JavadocDescription(List<JavadocDescriptionElement> elements) {
+        this();
+
+        this.elements.addAll(elements);
+    }
+
+    public boolean addElement(JavadocDescriptionElement element) {
+        return this.elements.add(element);
+    }
+
+    public List<JavadocDescriptionElement> getElements() {
+        return this.elements;
     }
 
     public String toText() {