Bugfixes
Fixed #13