Fixes
Merge pull request #2 from thestanislav/hotfix/patch-1

Fixes