diff --git a/.gitignore b/.gitignore
index 3c415b35..3499717a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,12 @@ tests/XSLT/test_path.hpp
 vs9/mangle.sln
 vs9/*.user
 vs10/mangle.sln
+/vs2013+/Arabica.VC.db
+/vs2013+/Arabica.VC.VC.opendb
+/vc12
+/vc14
+/vs2013+/int/vc12
+/vs2013+/int/vc14
 *.vcxproj.filters
 *.vcxproj.user
 
@@ -100,4 +106,4 @@ cmake-build-debug/
 spec
 gmon.out
 ipch
-test_path.hpp
+test_path.hpp
\ No newline at end of file
diff --git a/include/DOM/SAX2DOM/SAX2DOM.hpp b/include/DOM/SAX2DOM/SAX2DOM.hpp
index bd688e6f..229b79fc 100644
--- a/include/DOM/SAX2DOM/SAX2DOM.hpp
+++ b/include/DOM/SAX2DOM/SAX2DOM.hpp
@@ -208,10 +208,10 @@ class Parser : protected Arabica::SAX::DefaultHandler<stringT, typename ParserTy
         // attributes here
         for(int i = 0; i < atts.getLength(); ++i)
         {
-          stringT qName = atts.getQName(i);
-          if(string_adaptorT::empty(qName))
-            qName = atts.getLocalName(i);
-          elem.setAttributeNS(atts.getURI(i), qName, atts.getValue(i));
+          stringT attName = atts.getQName(i);
+          if(string_adaptorT::empty(attName))
+            attName = atts.getLocalName(i);
+          elem.setAttributeNS(atts.getURI(i), attName, atts.getValue(i));
         }
 
         currentNode_ = elem;
diff --git a/include/DOM/Simple/EventTargetImpl.hpp b/include/DOM/Simple/EventTargetImpl.hpp
index a4dc51d2..bec0347c 100644
--- a/include/DOM/Simple/EventTargetImpl.hpp
+++ b/include/DOM/Simple/EventTargetImpl.hpp
@@ -113,8 +113,8 @@ class EventTargetImpl : virtual public Arabica::DOM::Events::EventTarget_impl<st
         EventTargetImplT* nodeImpl = dynamic_cast<EventTargetImplT*>(it->Impl());
         if (nodeImpl != NULL) {
           std::pair<eventListenerIterator, eventListenerIterator> range = nodeImpl->eventCapturers_.equal_range(event.getType());
-          for (eventListenerIterator it = range.first; it != range.second; ++it) {
-            it->second->handleEvent(event);
+          for (eventListenerIterator itListener = range.first; itListener != range.second; ++itListener) {
+            itListener->second->handleEvent(event);
           }
           // stopPropagation was called on the event
           if (eventImpl->stopped_)
@@ -137,9 +137,9 @@ class EventTargetImpl : virtual public Arabica::DOM::Events::EventTarget_impl<st
         while(rit != eventAncestorChain.rend()) {
           EventTargetImplT* nodeImpl = dynamic_cast<EventTargetImplT*>(rit->Impl());
           if (nodeImpl != NULL) {
-            std::pair<eventListenerIterator, eventListenerIterator> range = nodeImpl->eventListeners_.equal_range(event.getType());
-            for (eventListenerIterator rit = range.first; rit != range.second; ++rit) {
-              rit->second->handleEvent(event);
+            std::pair<eventListenerIterator, eventListenerIterator> range1 = nodeImpl->eventListeners_.equal_range(event.getType());
+            for (eventListenerIterator ritListener = range1.first; ritListener != range1.second; ++ritListener) {
+              ritListener->second->handleEvent(event);
             }
             // stopPropagation was called on the event
             if (eventImpl->stopped_)
diff --git a/include/DOM/io/Stream.hpp b/include/DOM/io/Stream.hpp
index cc40a791..39369f25 100644
--- a/include/DOM/io/Stream.hpp
+++ b/include/DOM/io/Stream.hpp
@@ -173,7 +173,8 @@ int prefix_mapper(std::basic_ostream<charT, traitsT>& stream,
   {
     //DOM::Node<stringT, string_adaptorT> attr = attrs.getNamedItem(*a);
     const DOM::Node<stringT, string_adaptorT> attr = attrNodes[a];
-    if(isXmlns<stringT, string_adaptorT, charT>(attr.getNodeName()) || 
+    if(attr.getNodeName().empty() ||
+       isXmlns<stringT, string_adaptorT, charT>(attr.getNodeName()) ||
        isXmlns<stringT, string_adaptorT, charT>(attr.getPrefix()))
       continue;
     stream << UnicodeT::SPACE;
diff --git a/include/SAX/wrappers/saxmsxml2.hpp b/include/SAX/wrappers/saxmsxml2.hpp
index 8c262f11..903a0c62 100644
--- a/include/SAX/wrappers/saxmsxml2.hpp
+++ b/include/SAX/wrappers/saxmsxml2.hpp
@@ -23,6 +23,11 @@
 #include <comdef.h>
 _COM_SMARTPTR_TYPEDEF(ISAXXMLReader, __uuidof(ISAXXMLReader));
 
+#if defined(_MSC_VER)
+#  pragma warning( push )
+#  pragma warning( disable : 6031 )
+#endif
+
 namespace Arabica
 {
 namespace SAX
@@ -1072,6 +1077,10 @@ void msxml2_wrapper<string_type, T0, T1>::parse(inputSourceT& source)
 } // namespace SAX
 } // namespace Arabica
 
+#if defined(_MSC_VER)
+#  pragma warning( pop )
+#endif
+
 #endif
 // end of file
 
diff --git a/include/XPath/impl/xpath_function.hpp b/include/XPath/impl/xpath_function.hpp
index d9074973..7c261d90 100644
--- a/include/XPath/impl/xpath_function.hpp
+++ b/include/XPath/impl/xpath_function.hpp
@@ -202,7 +202,7 @@ public:
   virtual double doEvaluate(const DOM::Node<string_type, string_adaptor>& context,
                             const ExecutionContext<string_type, string_adaptor>& executionContext) const
   {
-    return baseT::argAsNodeSet(0, context, executionContext).size();
+    return static_cast<double>(baseT::argAsNodeSet(0, context, executionContext).size());
   } // evaluate
 }; // class CountFn
 
@@ -480,7 +480,7 @@ protected:
     if(startAt < 0)
       startAt = 0;
     if((isInfinite(endAt)) || (endAt > string_adaptor::length(value)))
-      endAt = string_adaptor::length(value);
+      endAt = static_cast<double>(string_adaptor::length(value));
 
     return string_adaptor::substr(value, static_cast<int>(startAt), static_cast<int>(endAt - startAt));
   } // evaluate
@@ -498,7 +498,7 @@ public:
                                             const ExecutionContext<string_type, string_adaptor>& executionContext) const
   {
     string_type v = (baseT::argCount() > 0) ? baseT::argAsString(0, context, executionContext) : nodeStringValue<string_type, string_adaptor>(context);
-    return string_adaptor::length(v);
+    return static_cast<double>(string_adaptor::length(v));
   } // evaluate
 }; // StringLengthFn
 
diff --git a/include/XSLT/impl/xslt_precedence.hpp b/include/XSLT/impl/xslt_precedence.hpp
index 1214300b..e6d905ca 100644
--- a/include/XSLT/impl/xslt_precedence.hpp
+++ b/include/XSLT/impl/xslt_precedence.hpp
@@ -66,7 +66,7 @@ public:
     if(other.precedence_.size() <= precedence_.size())
       return false;
 
-    for(int i = 0, ie = precedence_.size(); i != ie; ++i)
+    for(size_t i = 0, ie = precedence_.size(); i != ie; ++i)
       if(other.precedence_[i] != precedence_[i])
         return false;
 
@@ -93,8 +93,8 @@ bool operator<(const Precedence& lhs, const Precedence& rhs)
   if(lhs.precedence_ == rhs.precedence_)
     return false;
 
-  int len = (std::min)(lhs.precedence_.size(), rhs.precedence_.size());
-  for(int c = 0; c != len; ++c)
+  size_t len = (std::min)(lhs.precedence_.size(), rhs.precedence_.size());
+  for(size_t c = 0; c != len; ++c)
   {
     if(lhs.precedence_[c] < rhs.precedence_[c])
       return true;
diff --git a/include/convert/impl/codecvt_specialisations.hpp b/include/convert/impl/codecvt_specialisations.hpp
index c52cdc2e..bb488e2c 100644
--- a/include/convert/impl/codecvt_specialisations.hpp
+++ b/include/convert/impl/codecvt_specialisations.hpp
@@ -1,6 +1,18 @@
 #ifndef ARABICA_IMPL_CODECVT_SPECIALISATIONS_H
 #define ARABICA_IMPL_CODECVT_SPECIALISATIONS_H
 
+#if defined(_MSC_VER)
+#  if defined(max)
+#    pragma push_macro("max")
+#    undef max
+#  endif
+#  if defined(min)
+#    pragma push_macro("min")
+#    undef min
+#  endif
+#endif
+
+#include <algorithm>
 #include <locale>
 
 namespace std
@@ -128,4 +140,14 @@ protected:
 }; // class codecvt<char, wchar_t, std::mbstate_t> :
 
 } // namespace std
+
+#if defined(_MSC_VER)
+#  if defined(max)
+#    pragma pop_macro("max")
+#  endif
+#  if defined(min)
+#    pragma pop_macro("min")
+#  endif
+#endif
+
 #endif
diff --git a/include/io/socket_stream.hpp b/include/io/socket_stream.hpp
index 48bba0f8..83b8dd54 100644
--- a/include/io/socket_stream.hpp
+++ b/include/io/socket_stream.hpp
@@ -170,7 +170,7 @@ basic_socketbuf<charT, traitsT>* basic_socketbuf<charT, traitsT>::open(const cha
   sockAddr.sin_port = htons(port);
 
   // connect
-  int tmpsock = socket(AF_INET, SOCK_STREAM, 0);
+  int tmpsock = static_cast<int>(socket(AF_INET, SOCK_STREAM, 0));
   if(tmpsock == INVALID_SOCKET)
     return 0;
   if(connect(tmpsock, reinterpret_cast<sockaddr*>(&sockAddr), sizeof(sockaddr_in)) != 0)
@@ -267,7 +267,7 @@ bool basic_socketbuf<charT, traitsT>::writeSocket()
   if(!length)
     return true;
 
-  bool ok = (send(sock_, from_next, length, 0) != SOCKET_ERROR);
+  bool ok = (send(sock_, from_next, static_cast<int>(length), 0) != SOCKET_ERROR);
 
   if(ok)
     setp(from_next, from_next + outBuffer_.capacity());
@@ -289,13 +289,13 @@ int basic_socketbuf<charT, traitsT>::readSocket()
   if(!inBuffer_.capacity())
     growInBuffer();
 
-  size_t pbCount = std::min<int>(gptr() - eback(), pbSize_);
+  size_t pbCount = std::min<size_t>(gptr() - eback(), pbSize_);
 
   memcpy(&(inBuffer_[0]) + (pbSize_-pbCount)*sizeof(charT), 
          gptr() - pbCount*sizeof(charT),
          pbCount*sizeof(charT));
 
-  int res = recv(sock_, &(inBuffer_[0]) + pbSize_, inBuffer_.capacity() - pbSize_, 0);
+  int res = recv(sock_, &(inBuffer_[0]) + pbSize_, static_cast<int>(inBuffer_.capacity() - pbSize_), 0);
   if(res == 0)
   {
     // server closed the socket
diff --git a/src/convert/base64codecvt.cpp b/src/convert/base64codecvt.cpp
index b6775962..ea31d929 100644
--- a/src/convert/base64codecvt.cpp
+++ b/src/convert/base64codecvt.cpp
@@ -150,7 +150,7 @@ int base64codecvt::do_length(const std::mbstate_t&,
     chars -= 3;
   } // while(chars > max)
 
-  return length;
+  return static_cast<int>(length);
 } // do_length
 
 int base64codecvt::do_max_length() const throw()
diff --git a/src/convert/iso88591utf8codecvt.cpp b/src/convert/iso88591utf8codecvt.cpp
index edbd16c3..f243c193 100644
--- a/src/convert/iso88591utf8codecvt.cpp
+++ b/src/convert/iso88591utf8codecvt.cpp
@@ -55,7 +55,7 @@ int iso88591utf8codecvt::do_length(const std::mbstate_t&,
     ++from_next;
   } // while
 
-  return (from_next-from);
+  return static_cast<int>(from_next-from);
 } // do_length
 
 // end of file
diff --git a/src/convert/rot13codecvt.cpp b/src/convert/rot13codecvt.cpp
index 75eeabc3..ac25658c 100644
--- a/src/convert/rot13codecvt.cpp
+++ b/src/convert/rot13codecvt.cpp
@@ -4,6 +4,7 @@
 //
 ///////////////////////////////////////////
 
+#include <algorithm>
 #include <convert/rot13codecvt.hpp>
 
 #include <algorithm>
@@ -42,7 +43,7 @@ int rot13codecvt::do_length(const std::mbstate_t&,
                         const char* end,
                         size_t max) const
 {
-  return std::max<int>(end - from, max);
+  return std::max<int>(static_cast<int>(end - from), static_cast<int>(max));
 } // do_length
 
 // end of file
diff --git a/src/convert/ucs2utf8codecvt.cpp b/src/convert/ucs2utf8codecvt.cpp
index d4b17f52..9a28cca7 100644
--- a/src/convert/ucs2utf8codecvt.cpp
+++ b/src/convert/ucs2utf8codecvt.cpp
@@ -58,7 +58,7 @@ int ucs2utf8codecvt::do_length(const std::mbstate_t&,
     ++from_next;
   } // while
 
-  return (from_next-from);
+  return static_cast<int>(from_next-from);
 } // do_length
 
 // end of file
diff --git a/src/convert/utf16beucs2codecvt.cpp b/src/convert/utf16beucs2codecvt.cpp
index 2700a728..a2f1fd61 100644
--- a/src/convert/utf16beucs2codecvt.cpp
+++ b/src/convert/utf16beucs2codecvt.cpp
@@ -1,6 +1,7 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
+#include <algorithm>
 #include <convert/utf16beucs2codecvt.hpp>
 #ifndef ARABICA_NO_WCHAR_T
 #include <convert/impl/ucs2_utf16.hpp>
@@ -46,7 +47,7 @@ int utf16beucs2codecvt::do_length(const std::mbstate_t&,
                                 const char* end,
                                 size_t max) const
 {
-  return std::max<int>((end-from), max/2);
+  return std::max<int>(static_cast<int>(end-from), static_cast<int>(max/2));
 } // do_length
 
 #endif
diff --git a/src/convert/utf16leucs2codecvt.cpp b/src/convert/utf16leucs2codecvt.cpp
index e4ac5d6d..17abde79 100644
--- a/src/convert/utf16leucs2codecvt.cpp
+++ b/src/convert/utf16leucs2codecvt.cpp
@@ -1,6 +1,7 @@
 //---------------------------------------------------------------------------
 // $Id$
 //---------------------------------------------------------------------------
+#include <algorithm>
 #include <convert/utf16leucs2codecvt.hpp>
 #ifndef ARABICA_NO_WCHAR_T
 #include <convert/impl/ucs2_utf16.hpp>
@@ -46,7 +47,7 @@ int utf16leucs2codecvt::do_length(const std::mbstate_t&,
                                 const char* end,
                                 size_t max) const
 {
-  return std::max<int>((end-from), max/2);
+  return std::max<int>(static_cast<int>(end-from), static_cast<int>(max/2));
 } // do_length
 
 #endif
diff --git a/src/convert/utf16utf8codecvt.cpp b/src/convert/utf16utf8codecvt.cpp
index 3d1db319..690a5686 100644
--- a/src/convert/utf16utf8codecvt.cpp
+++ b/src/convert/utf16utf8codecvt.cpp
@@ -58,7 +58,7 @@ int utf16utf8codecvt::do_length(const std::mbstate_t&,
     ++from_next;
   } // while
 
-  return (from_next-from);
+  return static_cast<int>(from_next-from);
 } // do_length
 
 // end of file
diff --git a/src/convert/utf8iso88591codecvt.cpp b/src/convert/utf8iso88591codecvt.cpp
index 08c7ee95..0d2c0779 100644
--- a/src/convert/utf8iso88591codecvt.cpp
+++ b/src/convert/utf8iso88591codecvt.cpp
@@ -76,7 +76,7 @@ int utf8iso88591codecvt::do_length(const std::mbstate_t&,
     }
   } // while
 
-  return (from_next-from);
+  return static_cast<int>(from_next-from);
 } // do_length
 
 // end of file
diff --git a/src/convert/utf8ucs2codecvt.cpp b/src/convert/utf8ucs2codecvt.cpp
index b51a3d00..d7d89a0f 100644
--- a/src/convert/utf8ucs2codecvt.cpp
+++ b/src/convert/utf8ucs2codecvt.cpp
@@ -77,7 +77,7 @@ int utf8ucs2codecvt::do_length(const std::mbstate_t&,
     }
   } // while
 
-  return (from_next-from);
+  return static_cast<int>(from_next-from);
 } // do_length
 
 #endif
diff --git a/src/io/uri.cpp b/src/io/uri.cpp
index f28351ee..24e3cf64 100644
--- a/src/io/uri.cpp
+++ b/src/io/uri.cpp
@@ -182,7 +182,7 @@ void URI::combinePath(const std::string& relPath)
   size_t dots = path_.find("/../", from);
   while(dots != std::string::npos)
   {
-    int preceding_slash = (dots > 0) ? path_.rfind(FORWARD_SLASH, dots-1) : 0;
+    size_t preceding_slash = (dots > 0) ? path_.rfind(FORWARD_SLASH, dots-1) : 0;
     path_.erase(preceding_slash, dots+3-preceding_slash);
     dots = path_.find("/../", preceding_slash);
   } // while
diff --git a/tests/DOM/conformance/level1/core/characterdataappenddata.hpp b/tests/DOM/conformance/level1/core/characterdataappenddata.hpp
index 3511a9ca..4a663998 100644
--- a/tests/DOM/conformance/level1/core/characterdataappenddata.hpp
+++ b/tests/DOM/conformance/level1/core/characterdataappenddata.hpp
@@ -83,7 +83,7 @@ class characterdataappenddata : public DOMTestCase<string_type, string_adaptor>
       Node nameNode;
       CharacterData child;
       String childValue;
-      int childLength;
+      size_t childLength;
       doc = (Document) baseT::load("staff", true);
       elementList = doc.getElementsByTagName(SA::construct_from_utf8("name"));
       nameNode = elementList.item(0);
@@ -91,7 +91,7 @@ class characterdataappenddata : public DOMTestCase<string_type, string_adaptor>
       child.appendData(SA::construct_from_utf8(", Esquire"));
       childValue = child.getData();
       childLength = SA::length(childValue);
-      baseT::assertEquals(24, childLength, __LINE__, __FILE__);
+      baseT::assertEquals(24, static_cast<int>(childLength), __LINE__, __FILE__);
   
    }
   
diff --git a/tests/DOM/conformance/level1/core/characterdatagetlength.hpp b/tests/DOM/conformance/level1/core/characterdatagetlength.hpp
index 1c7f5257..f15a947c 100644
--- a/tests/DOM/conformance/level1/core/characterdatagetlength.hpp
+++ b/tests/DOM/conformance/level1/core/characterdatagetlength.hpp
@@ -79,14 +79,14 @@ class characterdatagetlength : public DOMTestCase<string_type, string_adaptor>
       Node nameNode;
       CharacterData child;
       String childValue;
-      int childLength;
+      size_t childLength;
       doc = (Document) baseT::load("staff", false);
       elementList = doc.getElementsByTagName(SA::construct_from_utf8("name"));
       nameNode = elementList.item(0);
       child = (CharacterData) nameNode.getFirstChild();
       childValue = child.getData();
       childLength = SA::length(childValue);
-      baseT::assertEquals(15, childLength, __LINE__, __FILE__);
+      baseT::assertEquals(15, static_cast<int>(childLength), __LINE__, __FILE__);
   
    }
   
diff --git a/tests/DOM/conformance/level1/core/hc_characterdataappenddata.hpp b/tests/DOM/conformance/level1/core/hc_characterdataappenddata.hpp
index 9a13d189..d81e0cfd 100644
--- a/tests/DOM/conformance/level1/core/hc_characterdataappenddata.hpp
+++ b/tests/DOM/conformance/level1/core/hc_characterdataappenddata.hpp
@@ -82,7 +82,7 @@ class hc_characterdataappenddata : public DOMTestCase<string_type, string_adapto
       Node nameNode;
       CharacterData child;
       String childValue;
-      int childLength;
+	  size_t childLength;
       doc = (Document) baseT::load("hc_staff", true);
       elementList = doc.getElementsByTagName(SA::construct_from_utf8("strong"));
       nameNode = elementList.item(0);
@@ -90,7 +90,7 @@ class hc_characterdataappenddata : public DOMTestCase<string_type, string_adapto
       child.appendData(SA::construct_from_utf8(", Esquire"));
       childValue = child.getData();
       childLength = SA::length(childValue);
-      baseT::assertEquals(24, childLength, __LINE__, __FILE__);
+      baseT::assertEquals(24, static_cast<int>(childLength), __LINE__, __FILE__);
   
    }
   
diff --git a/tests/DOM/conformance/level1/core/hc_characterdatagetlength.hpp b/tests/DOM/conformance/level1/core/hc_characterdatagetlength.hpp
index 68202994..08c5aa94 100644
--- a/tests/DOM/conformance/level1/core/hc_characterdatagetlength.hpp
+++ b/tests/DOM/conformance/level1/core/hc_characterdatagetlength.hpp
@@ -78,14 +78,14 @@ class hc_characterdatagetlength : public DOMTestCase<string_type, string_adaptor
       Node nameNode;
       CharacterData child;
       String childValue;
-      int childLength;
+	  size_t childLength;
       doc = (Document) baseT::load("hc_staff", false);
       elementList = doc.getElementsByTagName(SA::construct_from_utf8("strong"));
       nameNode = elementList.item(0);
       child = (CharacterData) nameNode.getFirstChild();
       childValue = child.getData();
       childLength = SA::length(childValue);
-      baseT::assertEquals(15, childLength, __LINE__, __FILE__);
+      baseT::assertEquals(15, static_cast<int>(childLength), __LINE__, __FILE__);
   
    }
   
diff --git a/vs2013+/Arabica.props b/vs2013+/Arabica.props
new file mode 100644
index 00000000..2b55c850
--- /dev/null
+++ b/vs2013+/Arabica.props
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_PropertySheetDisplayName>yekneb</_PropertySheetDisplayName>
+    <LinkIncremental>false</LinkIncremental>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <TargetPlatform Condition="'$(Platform)'=='Win32'">x86</TargetPlatform>
+    <TargetPlatform Condition="'$(Platform)'=='x64'">x64</TargetPlatform>
+    <VCSubDir Condition="'$(VisualStudioVersion)'=='12.0'">vc12</VCSubDir>
+    <VCSubDir Condition="'$(VisualStudioVersion)'=='14.0'">vc14</VCSubDir>
+    <VCSubDir Condition="'$(VisualStudioVersion)'=='14.0'">vc15</VCSubDir>
+    <OutDir>$([System.IO.Path]::GetFullPath('$(SolutionDir)..\$(VCSubDir)\$(TargetPlatform)\$(Configuration)\'))</OutDir>
+    <IntDir>$(SolutionDir)int\$(VCSubDir)\$(TargetPlatform)\$(Configuration)\$(ProjectName)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\include'));%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <BasicRuntimeChecks Condition="'$(Configuration)'=='Debug'">EnableFastChecks</BasicRuntimeChecks>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>      
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <DisableSpecificWarnings>4503</DisableSpecificWarnings>
+      <EnablePREfast>true</EnablePREfast>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <FunctionLevelLinking Condition="'$(Configuration)'=='Release'">true</FunctionLevelLinking>
+      <InlineFunctionExpansion Condition="'$(Configuration)'=='Release'">OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <Optimization Condition="'$(Configuration)'=='Debug'">Disabled</Optimization>
+      <Optimization Condition="'$(Configuration)'=='Release'">MaxSpeed</Optimization>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">_DEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release'">NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ProgramDataBaseFileName Condition="'$(ConfigurationType)'=='StaticLibrary'">$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <RuntimeLibrary Condition="'$(Configuration)'=='Debug'">MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary Condition="'$(Configuration)'=='Release'">MultiThreadedDLL</RuntimeLibrary>      
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <SDLCheck>true</SDLCheck>
+      <StringPooling Condition="'$(Configuration)'=='Debug'">false</StringPooling>
+      <StringPooling Condition="'$(Configuration)'=='Release'">true</StringPooling>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+    <Link>
+      <DataExecutionPrevention></DataExecutionPrevention>
+      <EnableCOMDATFolding Condition="'$(Configuration)'=='Release'">true</EnableCOMDATFolding>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <OptimizeReferences Condition="'$(Configuration)'=='Release'">true</OptimizeReferences>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <TargetMachine Condition="'$(Platform)'=='Win32'">MachineX86</TargetMachine>
+      <TargetMachine Condition="'$(Platform)'=='x64'">MachineX64</TargetMachine>
+    </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\include'));%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">_DEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release'">NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/vs2013+/Arabica.sln b/vs2013+/Arabica.sln
new file mode 100644
index 00000000..674e4456
--- /dev/null
+++ b/vs2013+/Arabica.sln
@@ -0,0 +1,118 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 12.0.40629.0
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_pyx", "example_SAX_pyx.vcxproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_SimpleHandler", "example_SAX_simplehander.vcxproj", "{4D861155-0183-4637-8F01-4F8FDB43C344}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_writer", "example_SAX_writer.vcxproj", "{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_xmlbase", "example_SAX_xmlbase.vcxproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOM_writer", "example_DOM_writer.vcxproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_transcode", "example_Utils_transcode.vcxproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XPath_xgrep", "example_XPath_xgrep.vcxproj", "{5F7B038E-5148-4EF4-AB43-5035F666D00D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XSLT_Mangle", "example_XSLT_Mangle.vcxproj", "{FDF423F0-ACF8-4963-81A4-C886B9174B72}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Taggle", "example_SAX_Taggle.vcxproj", "{274EB942-0AA8-4715-8419-4722868A22BA}"
+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
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.ActiveCfg = Debug|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.Build.0 = Debug|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.ActiveCfg = Release|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.Build.0 = Release|x64
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.Build.0 = Debug|Win32
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|x64.ActiveCfg = Debug|x64
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|x64.Build.0 = Debug|x64
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.ActiveCfg = Release|Win32
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.Build.0 = Release|Win32
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|x64.ActiveCfg = Release|x64
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|x64.Build.0 = Release|x64
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.Build.0 = Debug|Win32
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|x64.ActiveCfg = Debug|x64
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|x64.Build.0 = Debug|x64
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.ActiveCfg = Release|Win32
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.Build.0 = Release|Win32
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|x64.ActiveCfg = Release|x64
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|x64.Build.0 = Release|x64
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.Build.0 = Debug|Win32
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|x64.ActiveCfg = Debug|x64
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|x64.Build.0 = Debug|x64
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.ActiveCfg = Release|Win32
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.Build.0 = Release|Win32
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|x64.ActiveCfg = Release|x64
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|x64.Build.0 = Release|x64
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.Build.0 = Debug|Win32
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|x64.ActiveCfg = Debug|x64
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|x64.Build.0 = Debug|x64
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.ActiveCfg = Release|Win32
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.Build.0 = Release|Win32
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|x64.ActiveCfg = Release|x64
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|x64.Build.0 = Release|x64
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.Build.0 = Debug|Win32
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|x64.ActiveCfg = Debug|x64
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|x64.Build.0 = Debug|x64
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.ActiveCfg = Release|Win32
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.Build.0 = Release|Win32
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|x64.ActiveCfg = Release|x64
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|x64.Build.0 = Release|x64
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.Build.0 = Debug|Win32
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|x64.ActiveCfg = Debug|x64
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|x64.Build.0 = Debug|x64
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.ActiveCfg = Release|Win32
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.Build.0 = Release|Win32
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|x64.ActiveCfg = Release|x64
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|x64.Build.0 = Release|x64
+		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|Win32.Build.0 = Debug|Win32
+		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|x64.ActiveCfg = Debug|x64
+		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug|x64.Build.0 = Debug|x64
+		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|Win32.ActiveCfg = Release|Win32
+		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|Win32.Build.0 = Release|Win32
+		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|x64.ActiveCfg = Release|x64
+		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release|x64.Build.0 = Release|x64
+		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|Win32.Build.0 = Debug|Win32
+		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|x64.ActiveCfg = Debug|x64
+		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Debug|x64.Build.0 = Debug|x64
+		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.ActiveCfg = Release|Win32
+		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|Win32.Build.0 = Release|Win32
+		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|x64.ActiveCfg = Release|x64
+		{FDF423F0-ACF8-4963-81A4-C886B9174B72}.Release|x64.Build.0 = Release|x64
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.Build.0 = Debug|Win32
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|x64.ActiveCfg = Debug|x64
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|x64.Build.0 = Debug|x64
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.ActiveCfg = Release|Win32
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.Build.0 = Release|Win32
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|x64.ActiveCfg = Release|x64
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/vs2013+/Arabica_noboost.sln b/vs2013+/Arabica_noboost.sln
new file mode 100644
index 00000000..f2276fd5
--- /dev/null
+++ b/vs2013+/Arabica_noboost.sln
@@ -0,0 +1,98 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 12.0.40629.0
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_pyx", "example_SAX_pyx.vcxproj", "{5214A867-2768-4CD0-9E29-6EED20718556}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_SimpleHandler", "example_SAX_simplehander.vcxproj", "{4D861155-0183-4637-8F01-4F8FDB43C344}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_writer", "example_SAX_writer.vcxproj", "{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_xmlbase", "example_SAX_xmlbase.vcxproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOM_writer", "example_DOM_writer.vcxproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_Utils_transcode", "example_Utils_transcode.vcxproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_Taggle", "example_SAX_Taggle.vcxproj", "{274EB942-0AA8-4715-8419-4722868A22BA}"
+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
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|Win32.Build.0 = Debug|Win32
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|x64.ActiveCfg = Debug|x64
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Debug|x64.Build.0 = Debug|x64
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.ActiveCfg = Release|Win32
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|Win32.Build.0 = Release|Win32
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|x64.ActiveCfg = Release|x64
+		{5214A867-2768-4CD0-9E29-6EED20718556}.Release|x64.Build.0 = Release|x64
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|Win32.Build.0 = Debug|Win32
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|x64.ActiveCfg = Debug|x64
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Debug|x64.Build.0 = Debug|x64
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.ActiveCfg = Release|Win32
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|Win32.Build.0 = Release|Win32
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|x64.ActiveCfg = Release|x64
+		{4D861155-0183-4637-8F01-4F8FDB43C344}.Release|x64.Build.0 = Release|x64
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|Win32.Build.0 = Debug|Win32
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|x64.ActiveCfg = Debug|x64
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Debug|x64.Build.0 = Debug|x64
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.ActiveCfg = Release|Win32
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|Win32.Build.0 = Release|Win32
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|x64.ActiveCfg = Release|x64
+		{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}.Release|x64.Build.0 = Release|x64
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|Win32.Build.0 = Debug|Win32
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|x64.ActiveCfg = Debug|x64
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug|x64.Build.0 = Debug|x64
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.ActiveCfg = Release|Win32
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|Win32.Build.0 = Release|Win32
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|x64.ActiveCfg = Release|x64
+		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release|x64.Build.0 = Release|x64
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|Win32.Build.0 = Debug|Win32
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|x64.ActiveCfg = Debug|x64
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug|x64.Build.0 = Debug|x64
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.ActiveCfg = Release|Win32
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|Win32.Build.0 = Release|Win32
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|x64.ActiveCfg = Release|x64
+		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release|x64.Build.0 = Release|x64
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|Win32.Build.0 = Debug|Win32
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|x64.ActiveCfg = Debug|x64
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug|x64.Build.0 = Debug|x64
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.ActiveCfg = Release|Win32
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|Win32.Build.0 = Release|Win32
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|x64.ActiveCfg = Release|x64
+		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release|x64.Build.0 = Release|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.ActiveCfg = Debug|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.Build.0 = Debug|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.ActiveCfg = Release|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.Build.0 = Release|x64
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|Win32.Build.0 = Debug|Win32
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|x64.ActiveCfg = Debug|x64
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Debug|x64.Build.0 = Debug|x64
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.ActiveCfg = Release|Win32
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|Win32.Build.0 = Release|Win32
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|x64.ActiveCfg = Release|x64
+		{274EB942-0AA8-4715-8419-4722868A22BA}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/vs2013+/Arabica_noboost_tests.sln b/vs2013+/Arabica_noboost_tests.sln
new file mode 100644
index 00000000..616c2a05
--- /dev/null
+++ b/vs2013+/Arabica_noboost_tests.sln
@@ -0,0 +1,149 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 12.0.40629.0
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcxproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
+		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_silly.vcxproj", "{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
+		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "test_DOM_wide.vcxproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8} = {74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C} = {7D957E35-93D3-4C9E-A5EF-4B0620CE758C}
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
+		{FB5B88E9-DAB3-401C-B413-77403C562C49} = {FB5B88E9-DAB3-401C-B413-77403C562C49}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_utils", "test_utils.vcxproj", "{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter", "test_SAX_filter.vcxproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "test_SAX_filter_silly.vcxproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcxproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4} = {FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A} = {2E63A3DC-7A79-49F4-B0F9-78438DCA876A}
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2} = {A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica_noboost.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnitLib", "CppUnitLib.vcxproj", "{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}"
+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
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|x64.ActiveCfg = Debug|x64
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|x64.Build.0 = Debug|x64
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.Build.0 = Release|Win32
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|x64.ActiveCfg = Release|x64
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|x64.Build.0 = Release|x64
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.Build.0 = Debug|Win32
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|x64.ActiveCfg = Debug|x64
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|x64.Build.0 = Debug|x64
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.ActiveCfg = Release|Win32
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.Build.0 = Release|Win32
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|x64.ActiveCfg = Release|x64
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|x64.Build.0 = Release|x64
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.Build.0 = Debug|Win32
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|x64.ActiveCfg = Debug|x64
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|x64.Build.0 = Debug|x64
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|Win32.ActiveCfg = Release|Win32
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|Win32.Build.0 = Release|Win32
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|x64.ActiveCfg = Release|x64
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|x64.Build.0 = Release|x64
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|Win32.Build.0 = Debug|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|x64.ActiveCfg = Debug|x64
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|x64.Build.0 = Debug|x64
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.ActiveCfg = Release|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.Build.0 = Release|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|x64.ActiveCfg = Release|x64
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|x64.Build.0 = Release|x64
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|Win32.Build.0 = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|x64.ActiveCfg = Debug|x64
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|x64.Build.0 = Debug|x64
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.ActiveCfg = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.Build.0 = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|x64.ActiveCfg = Release|x64
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|x64.Build.0 = Release|x64
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|Win32.Build.0 = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|x64.ActiveCfg = Debug|x64
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|x64.Build.0 = Debug|x64
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.ActiveCfg = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.Build.0 = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|x64.ActiveCfg = Release|x64
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|x64.Build.0 = Release|x64
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.Build.0 = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|x64.ActiveCfg = Debug|x64
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|x64.Build.0 = Debug|x64
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.ActiveCfg = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.Build.0 = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|x64.ActiveCfg = Release|x64
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|x64.Build.0 = Release|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.ActiveCfg = Debug|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.Build.0 = Debug|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.ActiveCfg = Release|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.Build.0 = Release|x64
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.Build.0 = Debug|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|x64.ActiveCfg = Debug|x64
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|x64.Build.0 = Debug|x64
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.ActiveCfg = Release|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.Build.0 = Release|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|x64.ActiveCfg = Release|x64
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/vs2013+/Arabica_tests.sln b/vs2013+/Arabica_tests.sln
new file mode 100644
index 00000000..9a1fc817
--- /dev/null
+++ b/vs2013+/Arabica_tests.sln
@@ -0,0 +1,168 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 12.0.40629.0
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcxproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnitLib", "CppUnitLib.vcxproj", "{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test_DOM_silly.vcxproj", "{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "test_DOM_wide.vcxproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter", "test_SAX_filter.vcxproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_silly", "test_SAX_filter_silly.vcxproj", "{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX_filter_wide", "test_SAX_filter_wide.vcxproj", "{FB5B88E9-DAB3-401C-B413-77403C562C49}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_utils", "test_utils.vcxproj", "{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath", "test_xpath.vcxproj", "{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath_silly", "test_xpath_silly.vcxproj", "{92BC362C-4B23-4444-A9A8-81933D01D283}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath_wide", "test_xpath_wide.vcxproj", "{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xslt", "test_xslt.vcxproj", "{44BA3424-C58E-4A49-ADDD-6180C61E5E34}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xslt_wide", "test_xslt_wide.vcxproj", "{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xslt_silly", "test_xslt_silly.vcxproj", "{9FBD30C4-8588-49A8-95E4-471307B57F7E}"
+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
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|Win32.Build.0 = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.ActiveCfg = Debug|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug|x64.Build.0 = Debug|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.ActiveCfg = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|Win32.Build.0 = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.ActiveCfg = Release|x64
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release|x64.Build.0 = Release|x64
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|Win32.Build.0 = Debug|Win32
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|x64.ActiveCfg = Debug|x64
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug|x64.Build.0 = Debug|x64
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.ActiveCfg = Release|Win32
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|Win32.Build.0 = Release|Win32
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|x64.ActiveCfg = Release|x64
+		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release|x64.Build.0 = Release|x64
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|Win32.Build.0 = Debug|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|x64.ActiveCfg = Debug|x64
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Debug|x64.Build.0 = Debug|x64
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.ActiveCfg = Release|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|Win32.Build.0 = Release|Win32
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|x64.ActiveCfg = Release|x64
+		{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}.Release|x64.Build.0 = Release|x64
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|Win32.Build.0 = Debug|Win32
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|x64.ActiveCfg = Debug|x64
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Debug|x64.Build.0 = Debug|x64
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.ActiveCfg = Release|Win32
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|Win32.Build.0 = Release|Win32
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|x64.ActiveCfg = Release|x64
+		{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}.Release|x64.Build.0 = Release|x64
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|Win32.Build.0 = Debug|Win32
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|x64.ActiveCfg = Debug|x64
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug|x64.Build.0 = Debug|x64
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|Win32.ActiveCfg = Release|Win32
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|Win32.Build.0 = Release|Win32
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|x64.ActiveCfg = Release|x64
+		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release|x64.Build.0 = Release|x64
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|Win32.Build.0 = Debug|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|x64.ActiveCfg = Debug|x64
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug|x64.Build.0 = Debug|x64
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.ActiveCfg = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|Win32.Build.0 = Release|Win32
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|x64.ActiveCfg = Release|x64
+		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release|x64.Build.0 = Release|x64
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|Win32.Build.0 = Debug|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|x64.ActiveCfg = Debug|x64
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Debug|x64.Build.0 = Debug|x64
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.ActiveCfg = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|Win32.Build.0 = Release|Win32
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|x64.ActiveCfg = Release|x64
+		{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}.Release|x64.Build.0 = Release|x64
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|Win32.Build.0 = Debug|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|x64.ActiveCfg = Debug|x64
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Debug|x64.Build.0 = Debug|x64
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.ActiveCfg = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|Win32.Build.0 = Release|Win32
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|x64.ActiveCfg = Release|x64
+		{FB5B88E9-DAB3-401C-B413-77403C562C49}.Release|x64.Build.0 = Release|x64
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|Win32.Build.0 = Debug|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|x64.ActiveCfg = Debug|x64
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Debug|x64.Build.0 = Debug|x64
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.ActiveCfg = Release|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|Win32.Build.0 = Release|Win32
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|x64.ActiveCfg = Release|x64
+		{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}.Release|x64.Build.0 = Release|x64
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug|Win32.Build.0 = Debug|Win32
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug|x64.ActiveCfg = Debug|x64
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug|x64.Build.0 = Debug|x64
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release|Win32.ActiveCfg = Release|Win32
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release|Win32.Build.0 = Release|Win32
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release|x64.ActiveCfg = Release|x64
+		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release|x64.Build.0 = Release|x64
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Debug|Win32.ActiveCfg = Debug|Win32
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Debug|Win32.Build.0 = Debug|Win32
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Debug|x64.ActiveCfg = Debug|x64
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Debug|x64.Build.0 = Debug|x64
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Release|Win32.ActiveCfg = Release|Win32
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Release|Win32.Build.0 = Release|Win32
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Release|x64.ActiveCfg = Release|x64
+		{92BC362C-4B23-4444-A9A8-81933D01D283}.Release|x64.Build.0 = Release|x64
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Debug|Win32.Build.0 = Debug|Win32
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Debug|x64.ActiveCfg = Debug|x64
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Debug|x64.Build.0 = Debug|x64
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Release|Win32.ActiveCfg = Release|Win32
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Release|Win32.Build.0 = Release|Win32
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Release|x64.ActiveCfg = Release|x64
+		{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}.Release|x64.Build.0 = Release|x64
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Debug|Win32.ActiveCfg = Debug|Win32
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Debug|Win32.Build.0 = Debug|Win32
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Debug|x64.ActiveCfg = Debug|x64
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Debug|x64.Build.0 = Debug|x64
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Release|Win32.ActiveCfg = Release|Win32
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Release|Win32.Build.0 = Release|Win32
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Release|x64.ActiveCfg = Release|x64
+		{44BA3424-C58E-4A49-ADDD-6180C61E5E34}.Release|x64.Build.0 = Release|x64
+		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Debug|Win32.Build.0 = Debug|Win32
+		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Debug|x64.ActiveCfg = Debug|x64
+		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Debug|x64.Build.0 = Debug|x64
+		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Release|Win32.ActiveCfg = Release|Win32
+		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Release|Win32.Build.0 = Release|Win32
+		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Release|x64.ActiveCfg = Release|x64
+		{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}.Release|x64.Build.0 = Release|x64
+		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Debug|Win32.Build.0 = Debug|Win32
+		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Debug|x64.ActiveCfg = Debug|x64
+		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Debug|x64.Build.0 = Debug|x64
+		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Release|Win32.ActiveCfg = Release|Win32
+		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Release|Win32.Build.0 = Release|Win32
+		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Release|x64.ActiveCfg = Release|x64
+		{9FBD30C4-8588-49A8-95E4-471307B57F7E}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/vs2013+/CppUnitLib.vcxproj b/vs2013+/CppUnitLib.vcxproj
new file mode 100644
index 00000000..311cd5de
--- /dev/null
+++ b/vs2013+/CppUnitLib.vcxproj
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{894C6ACE-97EE-497B-BC2C-310E6AC82EFC}</ProjectGuid>
+    <RootNamespace>CppUnitLib</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>CppUnit</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\CppUnit\textui\TableTestResult.cpp" />
+    <ClCompile Include="..\tests\CppUnit\framework\TestCase.cpp" />
+    <ClCompile Include="..\tests\CppUnit\framework\TestFailure.cpp" />
+    <ClCompile Include="..\tests\CppUnit\framework\TestResult.cpp" />
+    <ClCompile Include="..\tests\CppUnit\TestRunner.cpp" />
+    <ClCompile Include="..\tests\CppUnit\framework\TestSuite.cpp" />
+    <ClCompile Include="..\tests\CppUnit\textui\TextTestResult.cpp" />
+    <ClCompile Include="..\tests\CppUnit\textui\XmlTestResult.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\CppUnit\TestRunner.hpp" />
+    <ClInclude Include="..\tests\CppUnit\framework\CppUnitException.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\estring.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\Guards.h" />
+    <ClInclude Include="..\tests\CppUnit\textui\TableTestResult.hpp" />
+    <ClInclude Include="..\tests\CppUnit\framework\Test.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\TestCaller.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\TestCase.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\TestFailure.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\TestResult.h" />
+    <ClInclude Include="..\tests\CppUnit\framework\TestSuite.h" />
+    <ClInclude Include="..\tests\CppUnit\textui\TextTestResult.h" />
+    <ClInclude Include="..\tests\CppUnit\textui\XmlTestResult.hpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/example_DOM_writer.vcxproj b/vs2013+/example_DOM_writer.vcxproj
new file mode 100644
index 00000000..4a817703
--- /dev/null
+++ b/vs2013+/example_DOM_writer.vcxproj
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C1CF7801-1681-4F15-8D71-BBC814805AF2}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>DOMWriter</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile />
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile />
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile />
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile />
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\Dom\DOMWriter.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/example_SAX_Taggle.vcxproj b/vs2013+/example_SAX_Taggle.vcxproj
new file mode 100644
index 00000000..c72e319b
--- /dev/null
+++ b/vs2013+/example_SAX_Taggle.vcxproj
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{274EB942-0AA8-4715-8419-4722868A22BA}</ProjectGuid>
+    <RootNamespace>example_SAX_Taggle</RootNamespace>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>taggle</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile />
+    <Link />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile />
+    <Link />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile />
+    <Link />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile />
+    <Link />
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\Taggle\taggle.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="example_SAX_pyx.vcxproj">
+      <Project>{5214a867-2768-4cd0-9e29-6eed20718556}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="example_SAX_simplehander.vcxproj">
+      <Project>{4d861155-0183-4637-8f01-4f8fdb43c344}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/example_SAX_pyx.vcxproj b/vs2013+/example_SAX_pyx.vcxproj
new file mode 100644
index 00000000..c309d1cc
--- /dev/null
+++ b/vs2013+/example_SAX_pyx.vcxproj
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5214A867-2768-4CD0-9E29-6EED20718556}</ProjectGuid>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>pyx</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\Sax\pyx.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/example_SAX_simplehander.vcxproj b/vs2013+/example_SAX_simplehander.vcxproj
new file mode 100644
index 00000000..200e09cd
--- /dev/null
+++ b/vs2013+/example_SAX_simplehander.vcxproj
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>example_SAX_SimpleHandler</ProjectName>
+    <ProjectGuid>{4D861155-0183-4637-8F01-4F8FDB43C344}</ProjectGuid>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>simplehandler</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\Sax\SimpleHandler.cpp" />
+    <ClCompile Include="..\examples\Sax\wrapper.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\examples\Sax\SimpleHandler.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/example_SAX_writer.vcxproj b/vs2013+/example_SAX_writer.vcxproj
new file mode 100644
index 00000000..efa02c5e
--- /dev/null
+++ b/vs2013+/example_SAX_writer.vcxproj
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C57BA030-A81F-4EA2-9CB6-D1BE2404B787}</ProjectGuid>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>Writer</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\Sax\writer.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/example_SAX_xmlbase.vcxproj b/vs2013+/example_SAX_xmlbase.vcxproj
new file mode 100644
index 00000000..2ecd2995
--- /dev/null
+++ b/vs2013+/example_SAX_xmlbase.vcxproj
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>xmlbase</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\Sax\xmlbase.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/example_Utils_transcode.vcxproj b/vs2013+/example_Utils_transcode.vcxproj
new file mode 100644
index 00000000..bbb58216
--- /dev/null
+++ b/vs2013+/example_Utils_transcode.vcxproj
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{436B423B-BF20-4B2E-A187-604AF391FBE2}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>transcode</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\Utils\transcode.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/example_XPath_xgrep.vcxproj b/vs2013+/example_XPath_xgrep.vcxproj
new file mode 100644
index 00000000..a1317ed5
--- /dev/null
+++ b/vs2013+/example_XPath_xgrep.vcxproj
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5F7B038E-5148-4EF4-AB43-5035F666D00D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>xgrep</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\XPath\xgrep.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="example_DOM_writer.vcxproj">
+      <Project>{c1cf7801-1681-4f15-8d71-bbc814805af2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/example_XSLT_Mangle.vcxproj b/vs2013+/example_XSLT_Mangle.vcxproj
new file mode 100644
index 00000000..ce2b3924
--- /dev/null
+++ b/vs2013+/example_XSLT_Mangle.vcxproj
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FDF423F0-ACF8-4963-81A4-C886B9174B72}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>mangle</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\examples\Xslt\mangle.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\Xslt\XSLT.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_apply_imports.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_apply_templates.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_attribute.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_call_template.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_choose.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_comment.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_compilation_context.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_copy.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_element.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_execution_context.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_for_each.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_functions.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_if.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_inline_element.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_item.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_key.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_message.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_namespace_stack.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_output.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_param.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_precedence.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_processing_instruction.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_qname.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_sink.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_sort.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_stylesheet.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_stylesheet_compiler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_template.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_text.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_top_level_param.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_value_of.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_variable.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_variable_impl.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_variable_stack.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\xslt_with_param.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_apply_imports_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_apply_templates_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_attribute_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_call_template_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_choose_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_comment_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_copy_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_create_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_element_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_for_each_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_if_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_include_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_inline_element_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_item_container_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_key_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_message_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_namespace_alias_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_output_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_processing_instruction_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_sort_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_template_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_text_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_value_of_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_value_validation.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_variable_handler.hpp" />
+    <ClInclude Include="..\include\Xslt\impl\handler\xslt_with_param_handler.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\tests\XSLT\TO-DO" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/lib_arabica.vcxproj b/vs2013+/lib_arabica.vcxproj
new file mode 100644
index 00000000..75b4aa29
--- /dev/null
+++ b/vs2013+/lib_arabica.vcxproj
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ArabicaLib</ProjectName>
+    <ProjectGuid>{4CA72415-D03A-4447-BE4E-C093A5146CAC}</ProjectGuid>
+    <RootNamespace>ArabicaLib</RootNamespace>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Arabica</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Arabica</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Arabica</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Arabica</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\Sax\AttributeList.hpp" />
+    <ClInclude Include="..\include\Sax\Attributes.hpp" />
+    <ClInclude Include="..\include\Sax\ContentHandler.hpp" />
+    <ClInclude Include="..\include\Sax\DocumentHandler.hpp" />
+    <ClInclude Include="..\include\Sax\DTDHandler.hpp" />
+    <ClInclude Include="..\include\Sax\EntityResolver.hpp" />
+    <ClInclude Include="..\include\Sax\ErrorHandler.hpp" />
+    <ClInclude Include="..\include\Sax\HandlerBase.hpp" />
+    <ClInclude Include="..\include\Sax\InputSource.hpp" />
+    <ClInclude Include="..\include\Sax\IStreamHandle.hpp" />
+    <ClInclude Include="..\include\Sax\Locator.hpp" />
+    <ClInclude Include="..\include\Sax\Parser.hpp" />
+    <ClInclude Include="..\include\Sax\ParserConfig.hpp" />
+    <ClInclude Include="..\include\Sax\SAXException.hpp" />
+    <ClInclude Include="..\include\Sax\saxfwd.hpp" />
+    <ClInclude Include="..\include\Sax\SAXNotRecognizedException.hpp" />
+    <ClInclude Include="..\include\Sax\SAXNotSupportedException.hpp" />
+    <ClInclude Include="..\include\Sax\SAXParseException.hpp" />
+    <ClInclude Include="..\include\Sax\XMLFilter.hpp" />
+    <ClInclude Include="..\include\Sax\XMLReader.hpp" />
+    <ClInclude Include="..\include\Sax\ext\Attributes2.hpp" />
+    <ClInclude Include="..\include\Sax\ext\DeclHandler.hpp" />
+    <ClInclude Include="..\include\Sax\ext\DefaultHandler2.hpp" />
+    <ClInclude Include="..\include\Sax\ext\LexicalHandler.hpp" />
+    <ClInclude Include="..\include\Sax\ext\Locator2.hpp" />
+    <ClInclude Include="..\include\Sax\ext\ProgressiveParser.hpp" />
+    <ClInclude Include="..\include\Sax\filter\NamespaceTracker.hpp" />
+    <ClInclude Include="..\include\Sax\filter\TextCoalescer.hpp" />
+    <ClInclude Include="..\include\Sax\filter\TextOnly.hpp" />
+    <ClInclude Include="..\include\Sax\filter\Writer.hpp" />
+    <ClInclude Include="..\include\Sax\filter\XMLBaseTracker.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\AttributeDefaults.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\AttributeListImpl.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\AttributesImpl.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\AttributeTypes.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\CatchErrorHandler.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\DefaultHandler.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\FeatureNames.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\InputSourceResolver.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\LocatorImpl.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\NamespaceSupport.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\ParserAdaptor.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\PropertyNames.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\XMLBaseSupport.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\XMLFilterImpl.hpp" />
+    <ClInclude Include="..\include\Sax\parsers\saxgarden.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\saxexpat.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\saxlibxml2.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\saxmsxml2.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\saxxerces.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\XercesFeatureNames.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\XercesPropertyNames.hpp" />
+    <ClInclude Include="..\include\Dom\Attr.hpp" />
+    <ClInclude Include="..\include\Dom\CDATASection.hpp" />
+    <ClInclude Include="..\include\Dom\CharacterData.hpp" />
+    <ClInclude Include="..\include\Dom\Comment.hpp" />
+    <ClInclude Include="..\include\Dom\Document.hpp" />
+    <ClInclude Include="..\include\Dom\DocumentFragment.hpp" />
+    <ClInclude Include="..\include\Dom\DocumentType.hpp" />
+    <ClInclude Include="..\include\Dom\DOMException.hpp" />
+    <ClInclude Include="..\include\Dom\DOMImplementation.hpp" />
+    <ClInclude Include="..\include\Dom\Element.hpp" />
+    <ClInclude Include="..\include\Dom\Entity.hpp" />
+    <ClInclude Include="..\include\Dom\EntityReference.hpp" />
+    <ClInclude Include="..\include\Dom\NamedNodeMap.hpp" />
+    <ClInclude Include="..\include\Dom\Node.hpp" />
+    <ClInclude Include="..\include\Dom\NodeList.hpp" />
+    <ClInclude Include="..\include\Dom\Notation.hpp" />
+    <ClInclude Include="..\include\Dom\ProcessingInstruction.hpp" />
+    <ClInclude Include="..\include\Dom\Proxy.hpp" />
+    <ClInclude Include="..\include\Dom\Text.hpp" />
+    <ClInclude Include="..\include\Dom\DualMode\DualMode.hpp" />
+    <ClInclude Include="..\include\Dom\Events\DocumentEvent.hpp" />
+    <ClInclude Include="..\include\Dom\Events\Event.hpp" />
+    <ClInclude Include="..\include\Dom\Events\EventException.hpp" />
+    <ClInclude Include="..\include\Dom\Events\EventListener.hpp" />
+    <ClInclude Include="..\include\Dom\Events\EventTarget.hpp" />
+    <ClInclude Include="..\include\Dom\Events\MutationEvent.hpp" />
+    <ClInclude Include="..\include\Dom\Sax2dom\DocumentTypeImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Sax2dom\SAX2DOM.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\AttrImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\AttrMap.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\AttrNSImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\CDATASectionImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\CharacterDataImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\CommentImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\DocumentFragmentImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\DocumentImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\DocumentTypeImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\DOMImplementation.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\ElementByTagImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\ElementImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\ElementNSImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\EntityImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\EntityReferenceImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\Helpers.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\NamedNodeMapImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\NodeImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\NotationImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\ProcessingInstructionImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\TextImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversal.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversalImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\NodeFilter.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\NodeIterator.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\TraversalImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\TreeWalker.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\TreeWalkerImpl.hpp" />
+    <ClInclude Include="..\include\Dom\io\Stream.hpp" />
+    <ClInclude Include="..\include\XPath\XPath.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_arithmetic.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_ast.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_ast_ids.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_axis_enumerator.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_compile_context.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_execution_context.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_expression.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_expression_impl.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_function.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_function_holder.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_function_resolver.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_grammar.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_logical.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_match.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_match_rewrite.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_namespace_context.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_namespace_node.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_node_test.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_object.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_parser.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_relational.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_resolver_holder.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_step.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_union.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_value.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_variable.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_variable_resolver.hpp" />
+    <ClInclude Include="..\include\Arabica\getparam.hpp" />
+    <ClInclude Include="..\include\Arabica\StringAdaptor.hpp" />
+    <ClInclude Include="..\include\Arabica\stringadaptortag.hpp" />
+    <ClInclude Include="..\include\Xml\escaper.hpp" />
+    <ClInclude Include="..\include\XML\QName.hpp" />
+    <ClInclude Include="..\include\XML\strings.hpp" />
+    <ClInclude Include="..\include\Xml\XMLCharacterClasses.hpp" />
+    <ClInclude Include="..\include\io\convert_adaptor.hpp" />
+    <ClInclude Include="..\include\io\convertstream.hpp" />
+    <ClInclude Include="..\include\io\socket_stream.hpp" />
+    <ClInclude Include="..\include\io\uri.hpp" />
+    <ClInclude Include="..\include\convert\base64codecvt.hpp" />
+    <ClInclude Include="..\include\convert\impl\codecvt_specialisations.hpp" />
+    <ClInclude Include="..\include\convert\impl\iso88591_utf8.hpp" />
+    <ClInclude Include="..\include\convert\iso88591utf8codecvt.hpp" />
+    <ClInclude Include="..\include\convert\rot13codecvt.hpp" />
+    <ClInclude Include="..\include\convert\impl\ucs2_utf16.hpp" />
+    <ClInclude Include="..\include\convert\impl\ucs2_utf8.hpp" />
+    <ClInclude Include="..\include\convert\ucs2utf8codecvt.hpp" />
+    <ClInclude Include="..\include\convert\utf16beucs2codecvt.hpp" />
+    <ClInclude Include="..\include\convert\utf16leucs2codecvt.hpp" />
+    <ClInclude Include="..\include\convert\utf16utf8codecvt.hpp" />
+    <ClInclude Include="..\include\convert\utf8iso88591codecvt.hpp" />
+    <ClInclude Include="..\include\convert\utf8ucs2codecvt.hpp" />
+    <ClInclude Include="..\include\text\normalize_whitespace.hpp" />
+    <ClInclude Include="..\include\text\UnicodeCharacters.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\Element.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\ElementType.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\html\HTMLModels.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\html\HTMLScanner.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\html\HTMLSchema.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\Parser.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\ScanHandler.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\Scanner.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\Schema.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\SchemaImpl.hpp" />
+    <ClInclude Include="..\include\Taggle\Taggle.hpp" />
+    <ClInclude Include="..\include\XSLT\XSLT.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_apply_imports.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_apply_templates.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_attribute.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_call_template.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_choose.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_comment.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_compilation_context.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_copy.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_element.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_execution_context.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_for_each.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_functions.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_if.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_inline_element.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_item.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_key.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_message.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_namespace_stack.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_output.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_param.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_precedence.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_processing_instruction.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_qname.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_sink.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_sort.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_compiler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_parser.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_template.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_text.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_top_level_param.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_value_of.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_variable.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_variable_impl.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_variable_stack.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_with_param.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_imports_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_templates_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_attribute_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_call_template_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_choose_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_comment_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_constants.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_copy_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_create_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_element_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_for_each_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_if_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_include_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_inline_element_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_item_container_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_key_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_message_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_namespace_alias_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_output_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_processing_instruction_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_sort_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_template_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_text_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_of_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_validation.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_variable_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_with_param_handler.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\arabica.cpp" />
+    <ClCompile Include="..\src\XML\XMLCharacterClasses.cpp" />
+    <ClCompile Include="..\src\SAX\helpers\InputSourceResolver.cpp" />
+    <ClCompile Include="..\src\io\uri.cpp" />
+    <ClCompile Include="..\src\convert\base64codecvt.cpp" />
+    <ClCompile Include="..\src\convert\impl\iso88591_utf8.cpp" />
+    <ClCompile Include="..\src\convert\iso88591utf8codecvt.cpp" />
+    <ClCompile Include="..\src\convert\rot13codecvt.cpp" />
+    <ClCompile Include="..\src\convert\impl\ucs2_utf16.cpp" />
+    <ClCompile Include="..\src\convert\impl\ucs2_utf8.cpp" />
+    <ClCompile Include="..\src\convert\ucs2utf8codecvt.cpp" />
+    <ClCompile Include="..\src\convert\utf16beucs2codecvt.cpp" />
+    <ClCompile Include="..\src\convert\utf16leucs2codecvt.cpp" />
+    <ClCompile Include="..\src\convert\utf16utf8codecvt.cpp" />
+    <ClCompile Include="..\src\convert\utf8iso88591codecvt.cpp" />
+    <ClCompile Include="..\src\convert\utf8ucs2codecvt.cpp" />
+    <ClCompile Include="..\src\taggle\Schema.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\vs7\ArabicaConfig.S">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /TC /EP -D USE_MSXML ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/lib_arabica_noboost.vcxproj b/vs2013+/lib_arabica_noboost.vcxproj
new file mode 100644
index 00000000..26c1e1d3
--- /dev/null
+++ b/vs2013+/lib_arabica_noboost.vcxproj
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>ArabicaLib</ProjectName>
+    <ProjectGuid>{4CA72415-D03A-4447-BE4E-C093A5146CAC}</ProjectGuid>
+    <RootNamespace>ArabicaLib</RootNamespace>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Arabica</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Arabica</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Arabica</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Arabica</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib />
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\Sax\AttributeList.hpp" />
+    <ClInclude Include="..\include\Sax\Attributes.hpp" />
+    <ClInclude Include="..\include\Sax\ContentHandler.hpp" />
+    <ClInclude Include="..\include\Sax\DocumentHandler.hpp" />
+    <ClInclude Include="..\include\Sax\DTDHandler.hpp" />
+    <ClInclude Include="..\include\Sax\EntityResolver.hpp" />
+    <ClInclude Include="..\include\Sax\ErrorHandler.hpp" />
+    <ClInclude Include="..\include\Sax\HandlerBase.hpp" />
+    <ClInclude Include="..\include\Sax\InputSource.hpp" />
+    <ClInclude Include="..\include\Sax\IStreamHandle.hpp" />
+    <ClInclude Include="..\include\Sax\Locator.hpp" />
+    <ClInclude Include="..\include\Sax\Parser.hpp" />
+    <ClInclude Include="..\include\Sax\ParserConfig.hpp" />
+    <ClInclude Include="..\include\Sax\SAXException.hpp" />
+    <ClInclude Include="..\include\Sax\saxfwd.hpp" />
+    <ClInclude Include="..\include\Sax\SAXNotRecognizedException.hpp" />
+    <ClInclude Include="..\include\Sax\SAXNotSupportedException.hpp" />
+    <ClInclude Include="..\include\Sax\SAXParseException.hpp" />
+    <ClInclude Include="..\include\Sax\XMLFilter.hpp" />
+    <ClInclude Include="..\include\Sax\XMLReader.hpp" />
+    <ClInclude Include="..\include\Sax\ext\Attributes2.hpp" />
+    <ClInclude Include="..\include\Sax\ext\DeclHandler.hpp" />
+    <ClInclude Include="..\include\Sax\ext\DefaultHandler2.hpp" />
+    <ClInclude Include="..\include\Sax\ext\LexicalHandler.hpp" />
+    <ClInclude Include="..\include\Sax\ext\Locator2.hpp" />
+    <ClInclude Include="..\include\Sax\ext\ProgressiveParser.hpp" />
+    <ClInclude Include="..\include\Sax\filter\NamespaceTracker.hpp" />
+    <ClInclude Include="..\include\Sax\filter\TextCoalescer.hpp" />
+    <ClInclude Include="..\include\Sax\filter\TextOnly.hpp" />
+    <ClInclude Include="..\include\Sax\filter\Writer.hpp" />
+    <ClInclude Include="..\include\Sax\filter\XMLBaseTracker.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\AttributeDefaults.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\AttributeListImpl.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\AttributesImpl.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\AttributeTypes.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\CatchErrorHandler.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\DefaultHandler.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\FeatureNames.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\InputSourceResolver.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\LocatorImpl.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\NamespaceSupport.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\ParserAdaptor.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\PropertyNames.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\XMLBaseSupport.hpp" />
+    <ClInclude Include="..\include\Sax\helpers\XMLFilterImpl.hpp" />
+    <ClInclude Include="..\include\Sax\parsers\saxgarden.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\saxexpat.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\saxlibxml2.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\saxmsxml2.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\saxxerces.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\XercesFeatureNames.hpp" />
+    <ClInclude Include="..\include\Sax\wrappers\XercesPropertyNames.hpp" />
+    <ClInclude Include="..\include\Dom\Attr.hpp" />
+    <ClInclude Include="..\include\Dom\CDATASection.hpp" />
+    <ClInclude Include="..\include\Dom\CharacterData.hpp" />
+    <ClInclude Include="..\include\Dom\Comment.hpp" />
+    <ClInclude Include="..\include\Dom\Document.hpp" />
+    <ClInclude Include="..\include\Dom\DocumentFragment.hpp" />
+    <ClInclude Include="..\include\Dom\DocumentType.hpp" />
+    <ClInclude Include="..\include\Dom\DOMException.hpp" />
+    <ClInclude Include="..\include\Dom\DOMImplementation.hpp" />
+    <ClInclude Include="..\include\Dom\Element.hpp" />
+    <ClInclude Include="..\include\Dom\Entity.hpp" />
+    <ClInclude Include="..\include\Dom\EntityReference.hpp" />
+    <ClInclude Include="..\include\Dom\NamedNodeMap.hpp" />
+    <ClInclude Include="..\include\Dom\Node.hpp" />
+    <ClInclude Include="..\include\Dom\NodeList.hpp" />
+    <ClInclude Include="..\include\Dom\Notation.hpp" />
+    <ClInclude Include="..\include\Dom\ProcessingInstruction.hpp" />
+    <ClInclude Include="..\include\Dom\Proxy.hpp" />
+    <ClInclude Include="..\include\Dom\Text.hpp" />
+    <ClInclude Include="..\include\Dom\DualMode\DualMode.hpp" />
+    <ClInclude Include="..\include\Dom\Events\DocumentEvent.hpp" />
+    <ClInclude Include="..\include\Dom\Events\Event.hpp" />
+    <ClInclude Include="..\include\Dom\Events\EventException.hpp" />
+    <ClInclude Include="..\include\Dom\Events\EventListener.hpp" />
+    <ClInclude Include="..\include\Dom\Events\EventTarget.hpp" />
+    <ClInclude Include="..\include\Dom\Events\MutationEvent.hpp" />
+    <ClInclude Include="..\include\Dom\Sax2dom\DocumentTypeImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Sax2dom\SAX2DOM.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\AttrImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\AttrMap.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\AttrNSImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\CDATASectionImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\CharacterDataImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\CommentImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\DocumentFragmentImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\DocumentImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\DocumentTypeImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\DOMImplementation.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\ElementByTagImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\ElementImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\ElementNSImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\EntityImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\EntityReferenceImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\Helpers.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\NamedNodeMapImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\NodeImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\NotationImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\ProcessingInstructionImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Simple\TextImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversal.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\DocumentTraversalImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\NodeFilter.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\NodeIterator.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\TraversalImpl.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\TreeWalker.hpp" />
+    <ClInclude Include="..\include\Dom\Traversal\TreeWalkerImpl.hpp" />
+    <ClInclude Include="..\include\Dom\io\Stream.hpp" />
+    <ClInclude Include="..\include\XPath\XPath.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_arithmetic.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_ast.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_ast_ids.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_axis_enumerator.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_compile_context.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_execution_context.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_expression.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_expression_impl.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_function.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_function_holder.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_function_resolver.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_grammar.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_logical.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_match.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_match_rewrite.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_namespace_context.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_namespace_node.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_node_test.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_object.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_parser.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_relational.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_resolver_holder.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_step.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_union.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_value.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_variable.hpp" />
+    <ClInclude Include="..\include\XPath\impl\xpath_variable_resolver.hpp" />
+    <ClInclude Include="..\include\Arabica\getparam.hpp" />
+    <ClInclude Include="..\include\Arabica\StringAdaptor.hpp" />
+    <ClInclude Include="..\include\Arabica\stringadaptortag.hpp" />
+    <ClInclude Include="..\include\Xml\escaper.hpp" />
+    <ClInclude Include="..\include\XML\QName.hpp" />
+    <ClInclude Include="..\include\XML\strings.hpp" />
+    <ClInclude Include="..\include\Xml\XMLCharacterClasses.hpp" />
+    <ClInclude Include="..\include\io\convert_adaptor.hpp" />
+    <ClInclude Include="..\include\io\convertstream.hpp" />
+    <ClInclude Include="..\include\io\socket_stream.hpp" />
+    <ClInclude Include="..\include\io\uri.hpp" />
+    <ClInclude Include="..\include\convert\base64codecvt.hpp" />
+    <ClInclude Include="..\include\convert\impl\codecvt_specialisations.hpp" />
+    <ClInclude Include="..\include\convert\impl\iso88591_utf8.hpp" />
+    <ClInclude Include="..\include\convert\iso88591utf8codecvt.hpp" />
+    <ClInclude Include="..\include\convert\rot13codecvt.hpp" />
+    <ClInclude Include="..\include\convert\impl\ucs2_utf16.hpp" />
+    <ClInclude Include="..\include\convert\impl\ucs2_utf8.hpp" />
+    <ClInclude Include="..\include\convert\ucs2utf8codecvt.hpp" />
+    <ClInclude Include="..\include\convert\utf16beucs2codecvt.hpp" />
+    <ClInclude Include="..\include\convert\utf16leucs2codecvt.hpp" />
+    <ClInclude Include="..\include\convert\utf16utf8codecvt.hpp" />
+    <ClInclude Include="..\include\convert\utf8iso88591codecvt.hpp" />
+    <ClInclude Include="..\include\convert\utf8ucs2codecvt.hpp" />
+    <ClInclude Include="..\include\text\normalize_whitespace.hpp" />
+    <ClInclude Include="..\include\text\UnicodeCharacters.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\Element.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\ElementType.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\html\HTMLModels.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\html\HTMLScanner.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\html\HTMLSchema.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\Parser.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\ScanHandler.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\Scanner.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\Schema.hpp" />
+    <ClInclude Include="..\include\Taggle\impl\SchemaImpl.hpp" />
+    <ClInclude Include="..\include\Taggle\Taggle.hpp" />
+    <ClInclude Include="..\include\XSLT\XSLT.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_apply_imports.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_apply_templates.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_attribute.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_call_template.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_choose.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_comment.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_compilation_context.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_compiled_stylesheet.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_copy.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_element.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_execution_context.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_for_each.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_functions.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_if.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_inline_element.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_item.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_key.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_message.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_namespace_stack.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_output.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_param.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_precedence.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_processing_instruction.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_qname.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_sink.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_sort.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_compiler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_stylesheet_parser.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_template.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_text.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_top_level_param.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_value_of.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_variable.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_variable_impl.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_variable_stack.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\xslt_with_param.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_imports_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_apply_templates_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_attribute_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_call_template_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_choose_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_comment_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_constants.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_copy_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_create_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_element_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_for_each_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_if_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_include_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_inline_element_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_item_container_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_key_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_message_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_namespace_alias_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_output_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_processing_instruction_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_sort_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_template_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_text_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_of_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_value_validation.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_variable_handler.hpp" />
+    <ClInclude Include="..\include\XSLT\impl\handler\xslt_with_param_handler.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\arabica.cpp" />
+    <ClCompile Include="..\src\XML\XMLCharacterClasses.cpp" />
+    <ClCompile Include="..\src\SAX\helpers\InputSourceResolver.cpp" />
+    <ClCompile Include="..\src\io\uri.cpp" />
+    <ClCompile Include="..\src\convert\base64codecvt.cpp" />
+    <ClCompile Include="..\src\convert\impl\iso88591_utf8.cpp" />
+    <ClCompile Include="..\src\convert\iso88591utf8codecvt.cpp" />
+    <ClCompile Include="..\src\convert\rot13codecvt.cpp" />
+    <ClCompile Include="..\src\convert\impl\ucs2_utf16.cpp" />
+    <ClCompile Include="..\src\convert\impl\ucs2_utf8.cpp" />
+    <ClCompile Include="..\src\convert\ucs2utf8codecvt.cpp" />
+    <ClCompile Include="..\src\convert\utf16beucs2codecvt.cpp" />
+    <ClCompile Include="..\src\convert\utf16leucs2codecvt.cpp" />
+    <ClCompile Include="..\src\convert\utf16utf8codecvt.cpp" />
+    <ClCompile Include="..\src\convert\utf8iso88591codecvt.cpp" />
+    <ClCompile Include="..\src\convert\utf8ucs2codecvt.cpp" />
+    <ClCompile Include="..\src\taggle\Schema.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\vs7\ArabicaConfig.S">
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /TC /EP -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /TC /EP -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /TC /EP -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /TC /EP -D USE_MSXML -D NO_BOOST ..\vs7\ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.hpp</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\include\SAX\ArabicaConfig.hpp;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_DOM.vcxproj b/vs2013+/test_DOM.vcxproj
new file mode 100644
index 00000000..4553241e
--- /dev/null
+++ b/vs2013+/test_DOM.vcxproj
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}</ProjectGuid>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>DOM_test</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\DOM\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\DOM\dom_conf_test.hpp" />
+    <ClInclude Include="..\tests\DOM\dom_test_suite.hpp" />
+    <ClInclude Include="..\tests\DOM\test_Attribute.hpp" />
+    <ClInclude Include="..\tests\DOM\test_CDATA.hpp" />
+    <ClInclude Include="..\tests\DOM\test_CharacterData.hpp" />
+    <ClInclude Include="..\tests\DOM\test_Document.hpp" />
+    <ClInclude Include="..\tests\DOM\test_DocumentFragment.hpp" />
+    <ClInclude Include="..\tests\DOM\test_DocumentType.hpp" />
+    <ClInclude Include="..\tests\DOM\test_DOMImplementation.hpp" />
+    <ClInclude Include="..\tests\DOM\test_Element.hpp" />
+    <ClInclude Include="..\tests\DOM\test_NamedNodeMap.hpp" />
+    <ClInclude Include="..\tests\DOM\test_ProcessingInstruction.hpp" />
+    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
+    <ClInclude Include="..\tests\DOM\test_Siblings.hpp" />
+    <ClInclude Include="..\tests\DOM\test_Text.hpp" />
+    <ClInclude Include="..\tests\DOM\test_TreeWalker.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_DOM_silly.vcxproj b/vs2013+/test_DOM_silly.vcxproj
new file mode 100644
index 00000000..68828568
--- /dev/null
+++ b/vs2013+/test_DOM_silly.vcxproj
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7D957E35-93D3-4C9E-A5EF-4B0620CE758C}</ProjectGuid>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>DOM_test_silly</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\DOM\main_silly.cpp" />
+    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\Dom\dom_test_suite.hpp" />
+    <ClInclude Include="..\tests\silly_string\silly_string.hpp" />
+    <ClInclude Include="..\tests\Dom\test_Attribute.hpp" />
+    <ClInclude Include="..\tests\Dom\test_CDATA.hpp" />
+    <ClInclude Include="..\tests\Dom\test_CharacterData.hpp" />
+    <ClInclude Include="..\tests\Dom\test_Document.hpp" />
+    <ClInclude Include="..\tests\Dom\test_DocumentFragment.hpp" />
+    <ClInclude Include="..\tests\Dom\test_DocumentType.hpp" />
+    <ClInclude Include="..\tests\Dom\test_DOMImplementation.hpp" />
+    <ClInclude Include="..\tests\Dom\test_Element.hpp" />
+    <ClInclude Include="..\tests\Dom\test_ProcessingInstruction.hpp" />
+    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
+    <ClInclude Include="..\tests\Dom\test_Siblings.hpp" />
+    <ClInclude Include="..\tests\Dom\test_Text.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_DOM.vcxproj">
+      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_utils.vcxproj">
+      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_DOM_wide.vcxproj b/vs2013+/test_DOM_wide.vcxproj
new file mode 100644
index 00000000..92e12e27
--- /dev/null
+++ b/vs2013+/test_DOM_wide.vcxproj
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DE6FD811-12BD-4914-BA29-CD987C4B0D48}</ProjectGuid>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>DOM_test_wide</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\DOM\main_wide.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\DOM\dom_test_suite.hpp" />
+    <ClInclude Include="..\tests\Dom\test_Attribute.hpp" />
+    <ClInclude Include="..\tests\Dom\test_CDATA.hpp" />
+    <ClInclude Include="..\tests\Dom\test_CharacterData.hpp" />
+    <ClInclude Include="..\tests\Dom\test_Document.hpp" />
+    <ClInclude Include="..\tests\Dom\test_DocumentFragment.hpp" />
+    <ClInclude Include="..\tests\Dom\test_DocumentType.hpp" />
+    <ClInclude Include="..\tests\Dom\test_DOMImplementation.hpp" />
+    <ClInclude Include="..\tests\Dom\test_Element.hpp" />
+    <ClInclude Include="..\tests\Dom\test_ProcessingInstruction.hpp" />
+    <ClInclude Include="..\tests\Dom\test_SAX2DOM.hpp" />
+    <ClInclude Include="..\tests\Dom\test_Siblings.hpp" />
+    <ClInclude Include="..\tests\Dom\test_Text.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_DOM.vcxproj">
+      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_DOM_silly.vcxproj">
+      <Project>{7d957e35-93d3-4c9e-a5ef-4b0620ce758c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_utils.vcxproj">
+      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_SAX_filter.vcxproj b/vs2013+/test_SAX_filter.vcxproj
new file mode 100644
index 00000000..a056de9c
--- /dev/null
+++ b/vs2013+/test_SAX_filter.vcxproj
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}</ProjectGuid>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>sax_filter_test</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\Sax\filter_test.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_utils.vcxproj">
+      <Project>{fa1a13a0-07d3-4fc9-a2d2-9f5fa8c3c3a4}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_SAX_filter_silly.vcxproj b/vs2013+/test_SAX_filter_silly.vcxproj
new file mode 100644
index 00000000..1c8a380e
--- /dev/null
+++ b/vs2013+/test_SAX_filter_silly.vcxproj
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2E63A3DC-7A79-49F4-B0F9-78438DCA876A}</ProjectGuid>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>sax_filter_test_silly</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\Sax\filter_test_silly.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_SAX_filter_wide.vcxproj b/vs2013+/test_SAX_filter_wide.vcxproj
new file mode 100644
index 00000000..3ec3748a
--- /dev/null
+++ b/vs2013+/test_SAX_filter_wide.vcxproj
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FB5B88E9-DAB3-401C-B413-77403C562C49}</ProjectGuid>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>sax_filter_test_wide</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0809</Culture>
+    </ResourceCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\Sax\filter_test_wide.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\Sax\test_WhitespaceStripper.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_utils.vcxproj b/vs2013+/test_utils.vcxproj
new file mode 100644
index 00000000..92338566
--- /dev/null
+++ b/vs2013+/test_utils.vcxproj
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FA1A13A0-07D3-4FC9-A2D2-9F5FA8C3C3A4}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>utils_test</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\Utils\utils_test.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\Utils\test_base64.hpp" />
+    <ClInclude Include="..\tests\Utils\test_normalize_whitespace.hpp" />
+    <ClInclude Include="..\tests\Utils\test_qname.hpp" />
+    <ClInclude Include="..\tests\Utils\test_uri.hpp" />
+    <ClInclude Include="..\tests\Utils\test_xml_strings.hpp" />
+    <ClInclude Include="..\tests\Utils\util_test_suite.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_xpath.vcxproj b/vs2013+/test_xpath.vcxproj
new file mode 100644
index 00000000..ba9acd0f
--- /dev/null
+++ b/vs2013+/test_xpath.vcxproj
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>xpath_test</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\XPath\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
+    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
+    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
+    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
+    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
+    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
+    <ClInclude Include="..\tests\XPath\match_test.hpp" />
+    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
+    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
+    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
+    <ClInclude Include="..\tests\XPath\step_test.hpp" />
+    <ClInclude Include="..\tests\XPath\text_node_test.hpp" />
+    <ClInclude Include="..\tests\XPath\value_test.hpp" />
+    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_DOM.vcxproj">
+      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_xpath_silly.vcxproj b/vs2013+/test_xpath_silly.vcxproj
new file mode 100644
index 00000000..67002c45
--- /dev/null
+++ b/vs2013+/test_xpath_silly.vcxproj
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{92BC362C-4B23-4444-A9A8-81933D01D283}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>xpath_test_silly</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\XPath\main_silly.cpp" />
+    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
+    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
+    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
+    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
+    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
+    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
+    <ClInclude Include="..\tests\XPath\match_test.hpp" />
+    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
+    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
+    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
+    <ClInclude Include="..\tests\silly_string\silly_string.hpp" />
+    <ClInclude Include="..\tests\XPath\step_test.hpp" />
+    <ClInclude Include="..\tests\XPath\value_test.hpp" />
+    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_DOM.vcxproj">
+      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_xpath.vcxproj">
+      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_xpath_wide.vcxproj b/vs2013+/test_xpath_wide.vcxproj
new file mode 100644
index 00000000..d8103c15
--- /dev/null
+++ b/vs2013+/test_xpath_wide.vcxproj
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EA2AB1BF-D09C-4DCB-87C9-A6DB41BCC1FA}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>xpath_test_wide</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\XPath\main_wide.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\XPath\arithmetic_test.hpp" />
+    <ClInclude Include="..\tests\XPath\attr_value_test.hpp" />
+    <ClInclude Include="..\tests\XPath\axis_enumerator_test.hpp" />
+    <ClInclude Include="..\tests\XPath\execute_test.hpp" />
+    <ClInclude Include="..\tests\XPath\expression_test.hpp" />
+    <ClInclude Include="..\tests\XPath\logical_test.hpp" />
+    <ClInclude Include="..\tests\XPath\match_test.hpp" />
+    <ClInclude Include="..\tests\XPath\node_test_test.hpp" />
+    <ClInclude Include="..\tests\XPath\parse_test.hpp" />
+    <ClInclude Include="..\tests\XPath\relational_test.hpp" />
+    <ClInclude Include="..\tests\XPath\step_test.hpp" />
+    <ClInclude Include="..\tests\XPath\value_test.hpp" />
+    <ClInclude Include="..\tests\XPath\xpath_test_suite.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_DOM.vcxproj">
+      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_xpath.vcxproj">
+      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_xslt.vcxproj b/vs2013+/test_xslt.vcxproj
new file mode 100644
index 00000000..56eaa278
--- /dev/null
+++ b/vs2013+/test_xslt.vcxproj
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{44BA3424-C58E-4A49-ADDD-6180C61E5E34}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>xslt_test</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\Xslt\main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
+    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
+    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_DOM.vcxproj">
+      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_xpath.vcxproj">
+      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_xslt_silly.vcxproj b/vs2013+/test_xslt_silly.vcxproj
new file mode 100644
index 00000000..cef2cea2
--- /dev/null
+++ b/vs2013+/test_xslt_silly.vcxproj
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9FBD30C4-8588-49A8-95E4-471307B57F7E}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>xslt_test_silly</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\silly_string\silly_string.cpp" />
+    <ClCompile Include="..\tests\Xslt\main_silly.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
+    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
+    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_DOM.vcxproj">
+      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_xpath.vcxproj">
+      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_xslt_wide.vcxproj b/vs2013+/test_xslt_wide.vcxproj
new file mode 100644
index 00000000..2fa08b09
--- /dev/null
+++ b/vs2013+/test_xslt_wide.vcxproj
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B4FB0A94-1792-43F1-A57F-4D77AB7593DB}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="Arabica.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>xslt_test_wide</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\Xslt\main_wide.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
+    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
+    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CppUnitLib.vcxproj">
+      <Project>{894c6ace-97ee-497b-bc2c-310e6ac82efc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_DOM.vcxproj">
+      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_xpath.vcxproj">
+      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/vs2013+/test_xslt_wide.vcxproj.bak b/vs2013+/test_xslt_wide.vcxproj.bak
new file mode 100644
index 00000000..10abd775
--- /dev/null
+++ b/vs2013+/test_xslt_wide.vcxproj.bak
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{44BA3424-C58E-4A49-ADDD-6180C61E5E34}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)'=='15.0'">v141</PlatformToolset>
+    <LatestTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'=='14.0' OR '$(VisualStudioVersion)'=='15.0'">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'==''">8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug_test_xslt\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release_test_xslt\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">xslt_test</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">xslt_test</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\work\usr\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\lib\arabica-debug.lib;..\lib\cppunit-debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>NotSet</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/Zm1000  %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <DisableLanguageExtensions>false</DisableLanguageExtensions>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>..\lib\arabica.lib;..\lib\cppunit.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>
+      </OptimizeReferences>
+      <EnableCOMDATFolding>
+      </EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>NotSet</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\tests\Xslt\main_wide.cpp" />
+    <ClCompile Include="..\tests\XSLT\xslt_test.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\tests\Xslt\xslt_test.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\tests\XSLT\testsuite\TESTS\arabica-catalog.xml" />
+    <None Include="..\tests\Xslt\testsuite\Tests\arabica-expected-fails.xml" />
+    <None Include="..\tests\Xslt\testsuite\Tests\catalog.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="lib_arabica.vcxproj">
+      <Project>{4ca72415-d03a-4447-be4e-c093a5146cac}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_DOM.vcxproj">
+      <Project>{74a66132-475a-4da1-8ef7-9cb0ef71e3d8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="test_xpath.vcxproj">
+      <Project>{b3c75b3a-bb0a-4b23-87f9-fb9cd98ff8ce}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>