Merge branch 'develop'

README.md

@@ -440,7 +440,7 @@ additional options beyond these. see
         escape sequences not adhering to the json spec result in a `badarg` error
     
     any combination of these can be passed to **jsx** by using `{strict, [strict_option()]}`.
-    `strict` is equivalent to `{strict, [comments, bad_utf8, single_quotes, escapes]}` 
+    `strict` is equivalent to `{strict, [comments, trailing_commas, utf8, single_quotes, escapes]}`
 
 - `return_tail`
 

src/jsx_to_term.erl

@@ -423,6 +423,10 @@ return_maps_test_() ->
             [{}],
             jsx:decode(<<"{}">>, [])
         )},
+        {"an empty map", ?_assertEqual(
+            [{}],
+            jsx:decode(<<"{}">>, [{return_maps, false}])
+        )},
         {"a small map", ?_assertEqual(
             #{<<"awesome">> => true, <<"library">> => <<"jsx">>},
             jsx:decode(<<"{\"library\": \"jsx\", \"awesome\": true}">>, [return_maps])