diff --git a/makefiles/msvc2015/jsoncpp.sln b/makefiles/msvc2015/jsoncpp.sln
new file mode 100644
index 000000000..c4ecb9070
--- /dev/null
+++ b/makefiles/msvc2015/jsoncpp.sln
@@ -0,0 +1,42 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "lib_json.vcxproj", "{1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "jsontest.vcxproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_lib_json", "test_lib_json.vcxproj", "{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}.Debug|Win32.Build.0 = Debug|Win32
+ {1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}.Debug|x64.ActiveCfg = Debug|x64
+ {1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}.Debug|x64.Build.0 = Debug|x64
+ {1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}.Release|Win32.ActiveCfg = Release|Win32
+ {1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}.Release|Win32.Build.0 = Release|Win32
+ {1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}.Release|x64.ActiveCfg = Release|x64
+ {1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}.Release|x64.Build.0 = Release|x64
+ {25AF2DD2-D396-4668-B188-488C33B8E620}.Debug|Win32.ActiveCfg = Debug|Win32
+ {25AF2DD2-D396-4668-B188-488C33B8E620}.Debug|Win32.Build.0 = Debug|Win32
+ {25AF2DD2-D396-4668-B188-488C33B8E620}.Debug|x64.ActiveCfg = Debug|Win32
+ {25AF2DD2-D396-4668-B188-488C33B8E620}.Release|Win32.ActiveCfg = Release|Win32
+ {25AF2DD2-D396-4668-B188-488C33B8E620}.Release|Win32.Build.0 = Release|Win32
+ {25AF2DD2-D396-4668-B188-488C33B8E620}.Release|x64.ActiveCfg = Release|Win32
+ {B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug|Win32.Build.0 = Debug|Win32
+ {B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug|x64.ActiveCfg = Debug|Win32
+ {B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release|Win32.ActiveCfg = Release|Win32
+ {B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release|Win32.Build.0 = Release|Win32
+ {B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release|x64.ActiveCfg = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/makefiles/msvc2015/jsontest.vcxproj b/makefiles/msvc2015/jsontest.vcxproj
new file mode 100644
index 000000000..0645aef89
--- /dev/null
+++ b/makefiles/msvc2015/jsontest.vcxproj
@@ -0,0 +1,98 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {25AF2DD2-D396-4668-B188-488C33B8E620}
+ Win32Proj
+
+
+
+ Application
+ MultiByte
+ v140
+
+
+ Application
+ MultiByte
+ v140
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.40219.1
+ ../../build/vs71/debug/jsontest\
+ ../../build/vs71/debug/jsontest\
+ true
+ ../../build/vs71/release/jsontest\
+ ../../build/vs71/release/jsontest\
+ false
+
+
+
+ Disabled
+ ../../include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ Level3
+ EditAndContinue
+
+
+ $(OutDir)jsontest.exe
+ true
+ $(OutDir)jsontest.pdb
+ Console
+ MachineX86
+
+
+
+
+ ../../include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreaded
+
+
+ Level3
+ ProgramDatabase
+
+
+ $(OutDir)jsontest.exe
+ true
+ Console
+ true
+ true
+ MachineX86
+
+
+
+
+
+
+
+ {1e6c2c1c-6453-4129-ae3f-0ee8e6599c89}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/makefiles/msvc2015/jsontest.vcxproj.filters b/makefiles/msvc2015/jsontest.vcxproj.filters
new file mode 100644
index 000000000..610b540ea
--- /dev/null
+++ b/makefiles/msvc2015/jsontest.vcxproj.filters
@@ -0,0 +1,13 @@
+
+
+
+
+ {903591b3-ade3-4ce4-b1f9-1e175e62b014}
+
+
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/makefiles/msvc2015/lib_json.vcxproj b/makefiles/msvc2015/lib_json.vcxproj
new file mode 100644
index 000000000..fc98d7c5f
--- /dev/null
+++ b/makefiles/msvc2015/lib_json.vcxproj
@@ -0,0 +1,147 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {1E6C2C1C-6453-4129-AE3F-0EE8E6599C89}
+ Win32Proj
+ jsoncpp
+
+
+
+ StaticLibrary
+ true
+ Unicode
+ v140
+
+
+ StaticLibrary
+ true
+ Unicode
+ v140
+
+
+ StaticLibrary
+ false
+ true
+ Unicode
+ v140
+
+
+ StaticLibrary
+ false
+ true
+ Unicode
+ v140
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ NotUsing
+ Level3
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ ../../include
+ MultiThreadedDebug
+
+
+ Windows
+ true
+
+
+
+
+ NotUsing
+ Level3
+ Disabled
+ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
+ ../../include
+ MultiThreadedDebug
+
+
+ Windows
+ true
+
+
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ ../../include
+ MultiThreaded
+
+
+ Windows
+ true
+ true
+ true
+
+
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
+ ../../include
+ MultiThreaded
+
+
+ Windows
+ true
+ true
+ true
+
+
+
+
+
+
\ No newline at end of file
diff --git a/makefiles/msvc2015/lib_json.vcxproj.filters b/makefiles/msvc2015/lib_json.vcxproj.filters
new file mode 100644
index 000000000..63c740331
--- /dev/null
+++ b/makefiles/msvc2015/lib_json.vcxproj.filters
@@ -0,0 +1,33 @@
+
+
+
+
+ {c110bc57-c46e-476c-97ea-84d8014f431c}
+
+
+ {ed718592-5acf-47b5-8f2b-b8224590da6a}
+
+
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
\ No newline at end of file
diff --git a/makefiles/msvc2015/lib_json.vcxproj.user b/makefiles/msvc2015/lib_json.vcxproj.user
new file mode 100644
index 000000000..abe8dd896
--- /dev/null
+++ b/makefiles/msvc2015/lib_json.vcxproj.user
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/makefiles/msvc2015/test_lib_json.vcxproj b/makefiles/msvc2015/test_lib_json.vcxproj
new file mode 100644
index 000000000..ae367eba2
--- /dev/null
+++ b/makefiles/msvc2015/test_lib_json.vcxproj
@@ -0,0 +1,111 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}
+ test_lib_json
+ Win32Proj
+
+
+
+ Application
+ MultiByte
+ v140
+
+
+ Application
+ MultiByte
+ v140
+
+
+
+
+
+
+
+
+
+
+
+
+ <_ProjectFileVersion>10.0.40219.1
+ ../../build/vs71/debug/test_lib_json\
+ ../../build/vs71/debug/test_lib_json\
+ true
+ ../../build/vs71/release/test_lib_json\
+ ../../build/vs71/release/test_lib_json\
+ false
+
+
+
+ Disabled
+ ../../include;%(AdditionalIncludeDirectories)
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+ EnableFastChecks
+ MultiThreadedDebug
+
+
+ Level3
+ EditAndContinue
+
+
+ $(OutDir)test_lib_json.exe
+ true
+ $(OutDir)test_lib_json.pdb
+ Console
+ MachineX86
+
+
+ Running all unit tests
+ $(TargetPath)
+
+
+
+
+ ../../include;%(AdditionalIncludeDirectories)
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ MultiThreaded
+
+
+ Level3
+ ProgramDatabase
+
+
+ $(OutDir)test_lib_json.exe
+ true
+ Console
+ true
+ true
+ MachineX86
+
+
+ Running all unit tests
+ $(TargetPath)
+
+
+
+
+
+
+
+
+
+
+
+ {1e6c2c1c-6453-4129-ae3f-0ee8e6599c89}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/makefiles/msvc2015/test_lib_json.vcxproj.filters b/makefiles/msvc2015/test_lib_json.vcxproj.filters
new file mode 100644
index 000000000..8f0a17b99
--- /dev/null
+++ b/makefiles/msvc2015/test_lib_json.vcxproj.filters
@@ -0,0 +1,24 @@
+
+
+
+
+ Source Filter
+
+
+ Source Filter
+
+
+
+
+ {bf40cbfc-8e98-40b4-b9f3-7e8d579cbae2}
+
+
+ {5fd39074-89e6-4939-aa3f-694fefd296b1}
+
+
+
+
+ Header Files
+
+
+
\ No newline at end of file
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
index 3e58f44d0..93e326021 100644
--- a/src/lib_json/json_reader.cpp
+++ b/src/lib_json/json_reader.cpp
@@ -33,11 +33,13 @@
#include
#if defined(_MSC_VER)
+#if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
+#endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
#if !defined(snprintf)
#define snprintf _snprintf
-#endif
-#endif
+#endif //snprintf
+#endif //_MSC_VER
#endif
#if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
index 47f413d6a..86f150619 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -45,7 +45,9 @@
#define isfinite _finite
#endif
+#if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
+#endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
#if !defined(snprintf)
#define snprintf _snprintf
#endif