Fixed SWIG so C++ code is wrapped
Not well tested yet