Bugfixes
Merge pull request #19 from senkin/master

Bugfixes