fixes
Merge pull request #3 from kubukoz/master

fixes