Issue #34, new namespaces And a lot more! See commit log for detailed changes. Fixes #34, #31, parts of #12 and a lot of bugfixes! See merge request !13