moar fixes
Merge pull request #14 from zn4ke/devel

moar fixes