diff --git a/.gitignore b/.gitignore
index 1b20ca96dac41bc1695842da421f394b074b63ce..a0d4a7435f88cf6728cd68069e1fb44d7de846e6 100755
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ tests/tests
 #*#
 *~
 /tmp/
+/build
 CMakeCache.txt
 CMakeFiles
 CMakeLists.txt.user*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbd6fa643f668d70ab3c73c511ad4c355b8fc3d6..25b4134bf38bd42162f5b0fbbffb9dc75b9a14ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,9 +62,9 @@ add_subdirectory(maca-analyse)
 add_subdirectory(maca-reanalyse)
 add_subdirectory(maca-convert)
 
-if(UNIX)
-add_subdirectory(tests)
-endif()
+# if(UNIX)
+# add_subdirectory(tests)
+# endif()
 
 if(MACA_BUILD_SWIG)
 	FIND_PACKAGE(SWIG)
diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index e0a04e6da0f4340f641aee8e6bbf2a91eec881aa..01f4f0b1045e0402176226833064d76c377e73bf 100644
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -1,8 +1,15 @@
 PROJECT(MacaSwigWrap)
 
+set (CMAKE_CXX_STANDARD 11)
+
 find_package(Toki REQUIRED)
 set(TOKI_LIBS ${Toki_LIBRARY})
 
+find_package(LibXML++ REQUIRED QUIET)
+include_directories(${LibXML++_INCLUDE_DIRS})
+link_directories(${LibXML++_LIBRARY_DIRS})
+set(LIBS ${LIBS} ${LibXML++_LIBRARIES})
+
 find_package(Corpus2 1.0.8 REQUIRED)
 set(CORPUS2_LIBS ${Corpus2_LIBRARY})
 include_directories(${Corpus2_INCLUDE_DIR})
diff --git a/swig/maca.i b/swig/maca.i
index 2f4d002a7454a45fdf7cadeb39952fe32227b6a6..054c87930648c2840d08e277f3f07f33bda28ab3 100644
--- a/swig/maca.i
+++ b/swig/maca.i
@@ -3,10 +3,12 @@
 
 %module maca
 %{
-  //
+  #include <libxml++/libxml++.h>
 %}
 
 %include <libcorpus2/unicodestring.i>
+%include <libcorpus2/unicodestring.i>
+//%include <libcorpus2/corpus2exception.i>
 %include "plaintextreader.i"
 %include "premorphtextreader.i"