Merge pull request #8 from zn4ke/master

fixes