Bugfixes
Merge branch 'master' of github.com:SerendipityNL/Doctopus