diff --git a/xcode/valijson.xcodeproj/project.pbxproj b/xcode/valijson.xcodeproj/project.pbxproj
index 7d658f7..08134fd 100644
--- a/xcode/valijson.xcodeproj/project.pbxproj
+++ b/xcode/valijson.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 		6A477F8617D6EA000013571C /* libboost_regex-mt.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A477F8417D6BCBB0013571C /* libboost_regex-mt.dylib */; };
 		6A506D201AF88E5D00C2C818 /* test_json_pointer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A506D1F1AF88E5D00C2C818 /* test_json_pointer.cpp */; };
 		6A5C5D2A1C5B13D4004F40ED /* test_json11_adapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A5C5D291C5B13D4004F40ED /* test_json11_adapter.cpp */; };
-		6A5C5D4B1C5B1525004F40ED /* json11.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A5C5D411C5B1511004F40ED /* json11.cpp */; };
 		6A5C5D4E1C5B1554004F40ED /* libjson11.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A5C5D471C5B151F004F40ED /* libjson11.a */; };
 		6A725F4517F61D7000D6B2FF /* test_validation_errors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A725F4317F61B5100D6B2FF /* test_validation_errors.cpp */; };
 		6A725F4617F6404100D6B2FF /* test_adapter_comparison.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AB8FEB117E6DF9A0028E147 /* test_adapter_comparison.cpp */; };
@@ -20,6 +19,8 @@
 		6A725F4917F6404100D6B2FF /* test_rapidjson_adapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC18D3917CC874100FE0EC9 /* test_rapidjson_adapter.cpp */; };
 		6A725F4A17F6404100D6B2FF /* test_validator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AC18D3517CC86E000FE0EC9 /* test_validator.cpp */; };
 		6A773AAF1CB5CA8C007D66FA /* test_poly_constraint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A773AAE1CB5CA8C007D66FA /* test_poly_constraint.cpp */; };
+		6A8769AC230C1B9C008E1739 /* json11.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6A8769A5230C1B9C008E1739 /* json11.hpp */; };
+		6A8769AD230C1B9C008E1739 /* json11.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A8769A8230C1B9C008E1739 /* json11.cpp */; };
 		6A9E1856194DC44B003F1C4C /* test_fetch_document_callback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AA8A5DA17F8BDCA002728A0 /* test_fetch_document_callback.cpp */; };
 		6AA822FF1C3F38D4007103A7 /* test_picojson_adapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AA822FE1C3F38D4007103A7 /* test_picojson_adapter.cpp */; };
 		6AB2D0EF1C610ACB007F0EFF /* test_nlohmann_json_adapter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6AB2D0EE1C610ACB007F0EFF /* test_nlohmann_json_adapter.cpp */; };
@@ -73,8 +74,6 @@
 		6A5C5D271C5B13AB004F40ED /* json11_utils.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = json11_utils.hpp; sourceTree = "<group>"; };
 		6A5C5D281C5B13C3004F40ED /* picojson_utils.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = picojson_utils.hpp; sourceTree = "<group>"; };
 		6A5C5D291C5B13D4004F40ED /* test_json11_adapter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_json11_adapter.cpp; sourceTree = "<group>"; };
-		6A5C5D411C5B1511004F40ED /* json11.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = json11.cpp; sourceTree = "<group>"; };
-		6A5C5D421C5B1511004F40ED /* json11.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = json11.hpp; sourceTree = "<group>"; };
 		6A5C5D471C5B151F004F40ED /* libjson11.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libjson11.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		6A6962F81C1C113F00089239 /* folderInteger.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = folderInteger.json; sourceTree = "<group>"; };
 		6A6962F91C1C113F00089239 /* integer.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = integer.json; sourceTree = "<group>"; };
@@ -172,36 +171,45 @@
 		6A869A2517CD8641006864FA /* type.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = type.json; sourceTree = "<group>"; };
 		6A869A2617CD8641006864FA /* uniqueItems.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = uniqueItems.json; sourceTree = "<group>"; };
 		6A869A3017CD8A92006864FA /* rapidjson_utils.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = rapidjson_utils.hpp; sourceTree = "<group>"; };
+		6A8769A5230C1B9C008E1739 /* json11.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = json11.hpp; sourceTree = "<group>"; };
+		6A8769A8230C1B9C008E1739 /* json11.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = json11.cpp; sourceTree = "<group>"; };
+		6A8769B2230C1BF1008E1739 /* fwd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fwd.h; sourceTree = "<group>"; };
+		6A8769B3230C1BF1008E1739 /* memorystream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = memorystream.h; sourceTree = "<group>"; };
+		6A8769B4230C1BF1008E1739 /* reader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = "<group>"; };
+		6A8769B5230C1BF1008E1739 /* prettywriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = prettywriter.h; sourceTree = "<group>"; };
+		6A8769B6230C1BF1008E1739 /* ostreamwrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ostreamwrapper.h; sourceTree = "<group>"; };
+		6A8769B7230C1BF1008E1739 /* encodedstream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = encodedstream.h; sourceTree = "<group>"; };
+		6A8769B8230C1BF1008E1739 /* filereadstream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = filereadstream.h; sourceTree = "<group>"; };
+		6A8769B9230C1BF1008E1739 /* istreamwrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = istreamwrapper.h; sourceTree = "<group>"; };
+		6A8769BA230C1BF1008E1739 /* stringbuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stringbuffer.h; sourceTree = "<group>"; };
+		6A8769BC230C1BF1008E1739 /* ieee754.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ieee754.h; sourceTree = "<group>"; };
+		6A8769BD230C1BF1008E1739 /* strtod.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = strtod.h; sourceTree = "<group>"; };
+		6A8769BE230C1BF1008E1739 /* swap.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = swap.h; sourceTree = "<group>"; };
+		6A8769BF230C1BF1008E1739 /* regex.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = regex.h; sourceTree = "<group>"; };
+		6A8769C0230C1BF1008E1739 /* diyfp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = diyfp.h; sourceTree = "<group>"; };
+		6A8769C1230C1BF1008E1739 /* biginteger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = biginteger.h; sourceTree = "<group>"; };
+		6A8769C2230C1BF1008E1739 /* strfunc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = strfunc.h; sourceTree = "<group>"; };
+		6A8769C3230C1BF1008E1739 /* itoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = itoa.h; sourceTree = "<group>"; };
+		6A8769C4230C1BF1008E1739 /* stack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stack.h; sourceTree = "<group>"; };
+		6A8769C5230C1BF1008E1739 /* dtoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = dtoa.h; sourceTree = "<group>"; };
+		6A8769C6230C1BF1008E1739 /* meta.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = meta.h; sourceTree = "<group>"; };
+		6A8769C7230C1BF1008E1739 /* pow10.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pow10.h; sourceTree = "<group>"; };
+		6A8769C8230C1BF1008E1739 /* encodings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = encodings.h; sourceTree = "<group>"; };
+		6A8769C9230C1BF1008E1739 /* schema.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = schema.h; sourceTree = "<group>"; };
+		6A8769CA230C1BF1008E1739 /* stream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stream.h; sourceTree = "<group>"; };
+		6A8769CB230C1BF1008E1739 /* filewritestream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = filewritestream.h; sourceTree = "<group>"; };
+		6A8769CC230C1BF1008E1739 /* rapidjson.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rapidjson.h; sourceTree = "<group>"; };
+		6A8769CD230C1BF1008E1739 /* document.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = document.h; sourceTree = "<group>"; };
+		6A8769CE230C1BF1008E1739 /* allocators.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = allocators.h; sourceTree = "<group>"; };
+		6A8769CF230C1BF1008E1739 /* writer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = "<group>"; };
+		6A8769D1230C1BF1008E1739 /* error.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; };
+		6A8769D2230C1BF1008E1739 /* en.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = en.h; sourceTree = "<group>"; };
+		6A8769D3230C1BF1008E1739 /* memorybuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = memorybuffer.h; sourceTree = "<group>"; };
+		6A8769D4230C1BF1008E1739 /* pointer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pointer.h; sourceTree = "<group>"; };
+		6A8769D6230C1BF1008E1739 /* inttypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = inttypes.h; sourceTree = "<group>"; };
+		6A8769D7230C1BF1008E1739 /* stdint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stdint.h; sourceTree = "<group>"; };
+		6A8769DB230C1C21008E1739 /* json.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = json.hpp; sourceTree = "<group>"; };
 		6A8BA11C1CB71163001CA087 /* constraint_builder.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = constraint_builder.hpp; sourceTree = "<group>"; };
-		6A9297071C4B1A3500737891 /* allocators.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = allocators.h; sourceTree = "<group>"; };
-		6A9297081C4B1A3500737891 /* document.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = document.h; sourceTree = "<group>"; };
-		6A9297091C4B1A3500737891 /* encodedstream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = encodedstream.h; sourceTree = "<group>"; };
-		6A92970A1C4B1A3500737891 /* encodings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = encodings.h; sourceTree = "<group>"; };
-		6A92970C1C4B1A3500737891 /* en.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = en.h; sourceTree = "<group>"; };
-		6A92970D1C4B1A3500737891 /* error.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; };
-		6A92970E1C4B1A3500737891 /* filereadstream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = filereadstream.h; sourceTree = "<group>"; };
-		6A92970F1C4B1A3500737891 /* filewritestream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = filewritestream.h; sourceTree = "<group>"; };
-		6A9297111C4B1A3500737891 /* biginteger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = biginteger.h; sourceTree = "<group>"; };
-		6A9297121C4B1A3500737891 /* diyfp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = diyfp.h; sourceTree = "<group>"; };
-		6A9297131C4B1A3500737891 /* dtoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = dtoa.h; sourceTree = "<group>"; };
-		6A9297141C4B1A3500737891 /* ieee754.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ieee754.h; sourceTree = "<group>"; };
-		6A9297151C4B1A3500737891 /* itoa.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = itoa.h; sourceTree = "<group>"; };
-		6A9297161C4B1A3500737891 /* meta.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = meta.h; sourceTree = "<group>"; };
-		6A9297171C4B1A3500737891 /* pow10.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pow10.h; sourceTree = "<group>"; };
-		6A9297181C4B1A3500737891 /* stack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stack.h; sourceTree = "<group>"; };
-		6A9297191C4B1A3500737891 /* strfunc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = strfunc.h; sourceTree = "<group>"; };
-		6A92971A1C4B1A3500737891 /* strtod.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = strtod.h; sourceTree = "<group>"; };
-		6A92971B1C4B1A3500737891 /* memorybuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = memorybuffer.h; sourceTree = "<group>"; };
-		6A92971C1C4B1A3500737891 /* memorystream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = memorystream.h; sourceTree = "<group>"; };
-		6A92971E1C4B1A3500737891 /* inttypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = inttypes.h; sourceTree = "<group>"; };
-		6A92971F1C4B1A3500737891 /* stdint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stdint.h; sourceTree = "<group>"; };
-		6A9297201C4B1A3500737891 /* prettywriter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = prettywriter.h; sourceTree = "<group>"; };
-		6A9297211C4B1A3500737891 /* rapidjson.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = rapidjson.h; sourceTree = "<group>"; };
-		6A9297221C4B1A3500737891 /* reader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = "<group>"; };
-		6A9297231C4B1A3500737891 /* stringbuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = stringbuffer.h; sourceTree = "<group>"; };
-		6A9297241C4B1A3500737891 /* writer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = "<group>"; };
-		6A9297251C4B1A3500737891 /* license.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = license.txt; sourceTree = "<group>"; };
-		6A9297261C4B1A3500737891 /* readme.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = readme.md; sourceTree = "<group>"; };
 		6A9E1855194D486C003F1C4C /* utf8_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = utf8_utils.hpp; sourceTree = "<group>"; };
 		6AA334841AB5102C00F1928B /* assertions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = assertions.h; sourceTree = "<group>"; };
 		6AA334851AB5102C00F1928B /* autolink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = autolink.h; sourceTree = "<group>"; };
@@ -398,15 +406,6 @@
 			name = internal;
 			sourceTree = "<group>";
 		};
-		6A5C5D401C5B14BC004F40ED /* json11-2016-01-26 */ = {
-			isa = PBXGroup;
-			children = (
-				6A5C5D411C5B1511004F40ED /* json11.cpp */,
-				6A5C5D421C5B1511004F40ED /* json11.hpp */,
-			);
-			path = "json11-2016-01-26";
-			sourceTree = "<group>";
-		};
 		6A6962F61C1C113F00089239 /* remotes */ = {
 			isa = PBXGroup;
 			children = (
@@ -638,82 +637,105 @@
 			path = utils;
 			sourceTree = "<group>";
 		};
-		6A9297011C4B1A3500737891 /* rapidjson-1.0.2 */ = {
+		6A8769A0230C1B9C008E1739 /* json11-ec4e452 */ = {
 			isa = PBXGroup;
 			children = (
-				6A9297051C4B1A3500737891 /* include */,
-				6A9297251C4B1A3500737891 /* license.txt */,
-				6A9297261C4B1A3500737891 /* readme.md */,
+				6A8769A5230C1B9C008E1739 /* json11.hpp */,
+				6A8769A8230C1B9C008E1739 /* json11.cpp */,
 			);
-			path = "rapidjson-1.0.2";
+			path = "json11-ec4e452";
 			sourceTree = "<group>";
 		};
-		6A9297051C4B1A3500737891 /* include */ = {
+		6A8769AF230C1BF1008E1739 /* rapidjson-1.1.0 */ = {
 			isa = PBXGroup;
 			children = (
-				6A9297061C4B1A3500737891 /* rapidjson */,
+				6A8769B0230C1BF1008E1739 /* include */,
+			);
+			path = "rapidjson-1.1.0";
+			sourceTree = "<group>";
+		};
+		6A8769B0230C1BF1008E1739 /* include */ = {
+			isa = PBXGroup;
+			children = (
+				6A8769B1230C1BF1008E1739 /* rapidjson */,
 			);
 			path = include;
 			sourceTree = "<group>";
 		};
-		6A9297061C4B1A3500737891 /* rapidjson */ = {
+		6A8769B1230C1BF1008E1739 /* rapidjson */ = {
 			isa = PBXGroup;
 			children = (
-				6A9297071C4B1A3500737891 /* allocators.h */,
-				6A9297081C4B1A3500737891 /* document.h */,
-				6A9297091C4B1A3500737891 /* encodedstream.h */,
-				6A92970A1C4B1A3500737891 /* encodings.h */,
-				6A92970B1C4B1A3500737891 /* error */,
-				6A92970E1C4B1A3500737891 /* filereadstream.h */,
-				6A92970F1C4B1A3500737891 /* filewritestream.h */,
-				6A9297101C4B1A3500737891 /* internal */,
-				6A92971B1C4B1A3500737891 /* memorybuffer.h */,
-				6A92971C1C4B1A3500737891 /* memorystream.h */,
-				6A92971D1C4B1A3500737891 /* msinttypes */,
-				6A9297201C4B1A3500737891 /* prettywriter.h */,
-				6A9297211C4B1A3500737891 /* rapidjson.h */,
-				6A9297221C4B1A3500737891 /* reader.h */,
-				6A9297231C4B1A3500737891 /* stringbuffer.h */,
-				6A9297241C4B1A3500737891 /* writer.h */,
+				6A8769B2230C1BF1008E1739 /* fwd.h */,
+				6A8769B3230C1BF1008E1739 /* memorystream.h */,
+				6A8769B4230C1BF1008E1739 /* reader.h */,
+				6A8769B5230C1BF1008E1739 /* prettywriter.h */,
+				6A8769B6230C1BF1008E1739 /* ostreamwrapper.h */,
+				6A8769B7230C1BF1008E1739 /* encodedstream.h */,
+				6A8769B8230C1BF1008E1739 /* filereadstream.h */,
+				6A8769B9230C1BF1008E1739 /* istreamwrapper.h */,
+				6A8769BA230C1BF1008E1739 /* stringbuffer.h */,
+				6A8769BB230C1BF1008E1739 /* internal */,
+				6A8769C8230C1BF1008E1739 /* encodings.h */,
+				6A8769C9230C1BF1008E1739 /* schema.h */,
+				6A8769CA230C1BF1008E1739 /* stream.h */,
+				6A8769CB230C1BF1008E1739 /* filewritestream.h */,
+				6A8769CC230C1BF1008E1739 /* rapidjson.h */,
+				6A8769CD230C1BF1008E1739 /* document.h */,
+				6A8769CE230C1BF1008E1739 /* allocators.h */,
+				6A8769CF230C1BF1008E1739 /* writer.h */,
+				6A8769D0230C1BF1008E1739 /* error */,
+				6A8769D3230C1BF1008E1739 /* memorybuffer.h */,
+				6A8769D4230C1BF1008E1739 /* pointer.h */,
+				6A8769D5230C1BF1008E1739 /* msinttypes */,
 			);
 			path = rapidjson;
 			sourceTree = "<group>";
 		};
-		6A92970B1C4B1A3500737891 /* error */ = {
+		6A8769BB230C1BF1008E1739 /* internal */ = {
 			isa = PBXGroup;
 			children = (
-				6A92970C1C4B1A3500737891 /* en.h */,
-				6A92970D1C4B1A3500737891 /* error.h */,
-			);
-			path = error;
-			sourceTree = "<group>";
-		};
-		6A9297101C4B1A3500737891 /* internal */ = {
-			isa = PBXGroup;
-			children = (
-				6A9297111C4B1A3500737891 /* biginteger.h */,
-				6A9297121C4B1A3500737891 /* diyfp.h */,
-				6A9297131C4B1A3500737891 /* dtoa.h */,
-				6A9297141C4B1A3500737891 /* ieee754.h */,
-				6A9297151C4B1A3500737891 /* itoa.h */,
-				6A9297161C4B1A3500737891 /* meta.h */,
-				6A9297171C4B1A3500737891 /* pow10.h */,
-				6A9297181C4B1A3500737891 /* stack.h */,
-				6A9297191C4B1A3500737891 /* strfunc.h */,
-				6A92971A1C4B1A3500737891 /* strtod.h */,
+				6A8769BC230C1BF1008E1739 /* ieee754.h */,
+				6A8769BD230C1BF1008E1739 /* strtod.h */,
+				6A8769BE230C1BF1008E1739 /* swap.h */,
+				6A8769BF230C1BF1008E1739 /* regex.h */,
+				6A8769C0230C1BF1008E1739 /* diyfp.h */,
+				6A8769C1230C1BF1008E1739 /* biginteger.h */,
+				6A8769C2230C1BF1008E1739 /* strfunc.h */,
+				6A8769C3230C1BF1008E1739 /* itoa.h */,
+				6A8769C4230C1BF1008E1739 /* stack.h */,
+				6A8769C5230C1BF1008E1739 /* dtoa.h */,
+				6A8769C6230C1BF1008E1739 /* meta.h */,
+				6A8769C7230C1BF1008E1739 /* pow10.h */,
 			);
 			path = internal;
 			sourceTree = "<group>";
 		};
-		6A92971D1C4B1A3500737891 /* msinttypes */ = {
+		6A8769D0230C1BF1008E1739 /* error */ = {
 			isa = PBXGroup;
 			children = (
-				6A92971E1C4B1A3500737891 /* inttypes.h */,
-				6A92971F1C4B1A3500737891 /* stdint.h */,
+				6A8769D1230C1BF1008E1739 /* error.h */,
+				6A8769D2230C1BF1008E1739 /* en.h */,
+			);
+			path = error;
+			sourceTree = "<group>";
+		};
+		6A8769D5230C1BF1008E1739 /* msinttypes */ = {
+			isa = PBXGroup;
+			children = (
+				6A8769D6230C1BF1008E1739 /* inttypes.h */,
+				6A8769D7230C1BF1008E1739 /* stdint.h */,
 			);
 			path = msinttypes;
 			sourceTree = "<group>";
 		};
+		6A8769DA230C1C21008E1739 /* nlohmann-json-3.1.2 */ = {
+			isa = PBXGroup;
+			children = (
+				6A8769DB230C1C21008E1739 /* json.hpp */,
+			);
+			path = "nlohmann-json-3.1.2";
+			sourceTree = "<group>";
+		};
 		6AA334801AB5100700F1928B /* jsoncpp-0.9.4 */ = {
 			isa = PBXGroup;
 			children = (
@@ -782,11 +804,12 @@
 		6AC18C1D17CC850F00FE0EC9 /* thirdparty */ = {
 			isa = PBXGroup;
 			children = (
+				6A8769A0230C1B9C008E1739 /* json11-ec4e452 */,
 				6AF70AC218FE71F600342325 /* gtest-1.7.0 */,
-				6A5C5D401C5B14BC004F40ED /* json11-2016-01-26 */,
 				6AA334801AB5100700F1928B /* jsoncpp-0.9.4 */,
 				6A8699E517CD8641006864FA /* JSON-Schema-Test-Suite */,
-				6A9297011C4B1A3500737891 /* rapidjson-1.0.2 */,
+				6A8769DA230C1C21008E1739 /* nlohmann-json-3.1.2 */,
+				6A8769AF230C1BF1008E1739 /* rapidjson-1.1.0 */,
 				6A725F4E17F89CD500D6B2FF /* urdl-2013-08-15 */,
 			);
 			name = thirdparty;
@@ -987,6 +1010,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				6A8769AC230C1B9C008E1739 /* json11.hpp in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1090,7 +1114,7 @@
 		6AC78AC517C5FBBC00674114 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 1030;
 				ORGANIZATIONNAME = "Tristan Penman";
 				TargetAttributes = {
 					6A5C5D461C5B151F004F40ED = {
@@ -1103,10 +1127,11 @@
 			};
 			buildConfigurationList = 6AC78AC817C5FBBC00674114 /* Build configuration list for PBXProject "valijson" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 6AC78AC417C5FBBC00674114;
 			productRefGroup = 6AC78ACE17C5FBBC00674114 /* Products */;
@@ -1127,7 +1152,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6A5C5D4B1C5B1525004F40ED /* json11.cpp in Sources */,
+				6A8769AD230C1B9C008E1739 /* json11.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1197,6 +1222,7 @@
 		6A5C5D491C5B151F004F40ED /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -1210,6 +1236,7 @@
 		6A5C5D4A1C5B151F004F40ED /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -1223,6 +1250,7 @@
 		6AB8FE8F17E6A57E0028E147 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				HEADER_SEARCH_PATHS = (
 					"../thirdparty/rapidjson-1.0.2/include",
 					../include,
@@ -1241,6 +1269,7 @@
 		6AB8FE9017E6A57E0028E147 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				HEADER_SEARCH_PATHS = (
 					"../thirdparty/rapidjson-1.0.2/include",
 					../include,
@@ -1259,6 +1288,8 @@
 		6AC18D4817CC899800FE0EC9 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_COMMA = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					GTEST_USE_OWN_TR1_TUPLE,
@@ -1271,11 +1302,11 @@
 				HEADER_SEARCH_PATHS = (
 					"../thirdparty/gtest-1.7.0/include",
 					"../thirdparty/gtest-1.7.0",
-					"../thirdparty/json11-2016-01-26",
+					"../thirdparty/json11-ec4e452",
 					"../thirdparty/jsoncpp-0.9.4/include",
-					"../thirdparty/nlohmann-json-1.1.0",
+					"../thirdparty/nlohmann-json-3.1.2",
 					"../thirdparty/picojson-1.3.0",
-					"../thirdparty/rapidjson-1.0.2/include",
+					"../thirdparty/rapidjson-1.1.0/include",
 					../include,
 					/usr/local/include,
 				);
@@ -1292,6 +1323,8 @@
 		6AC18D4917CC899800FE0EC9 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_COMMA = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					GTEST_USE_OWN_TR1_TUPLE,
 					GTEST_HAS_PARAM_TEST,
@@ -1302,11 +1335,11 @@
 				HEADER_SEARCH_PATHS = (
 					"../thirdparty/gtest-1.7.0/include",
 					"../thirdparty/gtest-1.7.0",
-					"../thirdparty/json11-2016-01-26",
+					"../thirdparty/json11-ec4e452",
 					"../thirdparty/jsoncpp-0.9.4/include",
-					"../thirdparty/nlohmann-json-1.1.0",
+					"../thirdparty/nlohmann-json-3.1.2",
 					"../thirdparty/picojson-1.3.0",
-					"../thirdparty/rapidjson-1.0.2/include",
+					"../thirdparty/rapidjson-1.1.0/include",
 					../include,
 					/usr/local/include,
 				);
@@ -1330,11 +1363,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -1376,11 +1411,13 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -1407,6 +1444,7 @@
 		6AC78AD717C5FBBC00674114 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				HEADER_SEARCH_PATHS = (
 					"../thirdparty/rapidjson-1.0.2/include",
 					../include,
@@ -1425,6 +1463,7 @@
 		6AC78AD817C5FBBC00674114 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				HEADER_SEARCH_PATHS = (
 					"../thirdparty/rapidjson-1.0.2/include",
 					../include,
@@ -1443,6 +1482,7 @@
 		6AEFECCA1AB53F1000275614 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				EXECUTABLE_PREFIX = lib;
@@ -1464,6 +1504,7 @@
 		6AEFECCB1AB53F1000275614 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				EXECUTABLE_PREFIX = lib;