Merge pull request #63 from simongareste/master

Minor Bugfixes: closes #51, closes #52.