Dependency fix
Merge branch 'minimal' into swig
Swig unittest and some swig structural changes