diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/layouts/shortcodes/postlist.html b/layouts/shortcodes/postlist.html
index ad372b1..b26e6e1 100644
--- a/layouts/shortcodes/postlist.html
+++ b/layouts/shortcodes/postlist.html
@@ -18,14 +18,53 @@
     {{- end -}}
 {{- end -}}
 
-<ul class="postlist">
-{{ range $pgr }}
-{{- if (ne .LinkTitle "") -}}
-  <li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
-{{- else if (ne .Summary "") -}}
-  <li><a href="{{ .RelPermalink }}">{{ .Summary | safeHTML | truncate 70 }}</a></li>
+{{- if (ne (.Get "limit") "") -}}
+    {{- $pgr = $pgr.Limit (int (.Get "limit")) -}}
+{{- end -}}
+
+{{- if (eq (.Get "display") "content") -}}
+    {{ if templates.Exists "partials/_postlist/post-content-before.html" }}
+      {{ partial "_postlist/post-content-before.html" $pgr }}
+    {{ end }}
+    <div class="postlist postlist-display-content h-feed">
+    {{ range $pgr }}
+      {{ if templates.Exists "partials/_postlist/post-content.html" }}
+        {{ partial "_postlist/post-content.html" . }}
+      {{ else }}
+        <div class="h-entry">
+        {{ if .Title }}
+            <h2 class="p-name"><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
+            {{ if .Params.custom_summary }}
+            <div class="p-summary">
+                <p>{{ .Summary | safeHTML }}<p>
+            </div>
+            {{ else }}
+                <div class="e-content">
+                    {{ .Content }}
+                </div>
+            {{ end }}
+        {{ else }}
+            <div class="e-content">
+                {{ .Content }}
+            </div>
+        {{ end }}
+        </div>    
+      {{ end }}
+    {{ end }}
+    </div>
+    {{ if templates.Exists "partials/_postlist/post-content-after.html" }}
+      {{ partial "_postlist/post-content-after.html" $pgr }}
+    {{ end }}
 {{- else -}}
-  <li><a href="{{ .RelPermalink }}">{{ .Content | safeHTML | truncate 70 }}</a></li>
-{{ end }}
-{{ end }}
-</ul>
\ No newline at end of file
+    <ul class="postlist">
+    {{ range $pgr }}
+    {{- if (ne .LinkTitle "") -}}
+      <li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
+    {{- else if (ne .Summary "") -}}
+      <li><a href="{{ .RelPermalink }}">{{ .Summary | safeHTML | truncate 70 }}</a></li>
+    {{- else -}}
+      <li><a href="{{ .RelPermalink }}">{{ .Content | safeHTML | truncate 70 }}</a></li>
+    {{ end }}
+    {{ end }}
+    </ul>
+{{- end -}}
\ No newline at end of file
diff --git a/plugin.json b/plugin.json
index 168cf6f..f1dd227 100644
--- a/plugin.json
+++ b/plugin.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.1.0",
+    "version": "1.2.0",
     "title": "Postlist",
     "description": "Shortcode for dynamically adding a list of posts",
     "includes": [