diff --git a/README.md b/README.md
index dd5ecf8a7..7bc173b4b 100644
--- a/README.md
+++ b/README.md
@@ -55,8 +55,10 @@ Though it's 2015 already, the support for C++11 is still a bit sparse. Currently
 - GCC 4.8
 - GCC 4.9
 - GCC 5.0
+- GCC 5.1
 - Clang 3.4
 - Clang 3.5
+- Clang 3.6
 
 I would be happy to learn about other compilers/versions.
 
diff --git a/src/json.hpp b/src/json.hpp
index b357a70fb..9d9cab32f 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -2323,7 +2323,7 @@ class basic_json
         typename object_t::iterator object_iterator;
         /// iterator for JSON arrays
         typename array_t::iterator array_iterator;
-        /// generic iteraotr for all other value types
+        /// generic iterator for all other value types
         difference_type generic_iterator;
 
         /// default constructor
diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
index c10a9cc6d..4c666d92e 100644
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -2323,7 +2323,7 @@ class basic_json
         typename object_t::iterator object_iterator;
         /// iterator for JSON arrays
         typename array_t::iterator array_iterator;
-        /// generic iteraotr for all other value types
+        /// generic iterator for all other value types
         difference_type generic_iterator;
 
         /// default constructor