First try
Almost moved to new typemaps library
Bugfixes
Bugfixes
More changes.