Small bugfixes
Add decanter to import path and merge conflict
More bugfixes
Merge pull request #35 from hermanschaaf/master

Small session bugfixes