bugfixes
Merge pull request #13 from zDemoniac/master

bugfixes