Fixes
Merge pull request #4 from truepl/master

Fixes