Bugfixes
Merge pull request #43 from pilsetnieks/master

Bugfixes