Fixes
Merge pull request #4 from ZlayaZhaba/master

Fixes