Merge pull request #8 from zn4ke/master

fixes
Merge pull request #9 from zn4ke/dev

Merge pull request #8 from zn4ke/master