Merge pull request #12 from NSchertler/master

Bugfixes