fixes
Merge pull request #12 from zn4ke/devel

fixes