bugfixes
Merge pull request #11 from zn4ke/devel

bugfixes