Some more bugfixes
Merge pull request #76 from chsticksel/master

Some more bugfixes