Bugfixes
Merge pull request #233 from SebastianLopienski/patch-6

Bugfixes