Bugfixes
Merge branch 'master' of github.com:cosmi/causeway