diff --git a/README.md b/README.md
index bb494cf..a27fb73 100755
--- a/README.md
+++ b/README.md
@@ -33,9 +33,13 @@ When creating a new field the extra options for `EntryType` will appear when sel
 
 ## Entries Subset Changelog
 
+### 0.5.2 -- 2016.03.16
+
+* Issue with not returning every entry type
+
 ### 0.5.1 -- 2016.03.14
 
-* Initial release
+* Issue with error when no types are selected
 
 ### 0.5.0 -- 2016.02.17
 
diff --git a/fieldtypes/EntriesSubsetFieldType.php b/fieldtypes/EntriesSubsetFieldType.php
index d671c16..0555a9b 100755
--- a/fieldtypes/EntriesSubsetFieldType.php
+++ b/fieldtypes/EntriesSubsetFieldType.php
@@ -52,8 +52,9 @@ public function getSettingsHtml()
     public function getEntryTypeOptions()
     {
         $sectionIds = craft()->sections->getAllSectionIds();
+        $entryTypes = array();
         foreach ($sectionIds as $id) {
-            $entryTypes = craft()->sections->getEntryTypesBySectionId($id);
+            $entryTypes = array_merge($entryTypes, craft()->sections->getEntryTypesBySectionId($id));
         }
 
         $entryTypeOptions = array(array('label' => Craft::t('All Entry Types'), 'value' => '*'));
diff --git a/releases.json b/releases.json
index 79d310c..cb05b14 100644
--- a/releases.json
+++ b/releases.json
@@ -1,10 +1,18 @@
 [
+    {
+        "version": "0.5.2",
+        "downloadUrl": "https://github.com/nfourtythree/entriessubset/archive/master.zip",
+        "date": "2016-03-16T13:34:00.111Z",
+        "notes": [
+            "[Fixed] Not returning every possible entry type"
+        ]
+    },
     {
         "version": "0.5.1",
         "downloadUrl": "https://github.com/nfourtythree/entriessubset/archive/master.zip",
         "date": "2016-03-14T12:00:00.111Z",
         "notes": [
-            "[Added] Initial release"
+            "[fixed] Issue with error when no types are selected"
         ]
     },
     {