moar fixes
Merge pull request #13 from zn4ke/devel

moar fixes