fixes
Merge pull request #3 from zn4ke/dev

fixes