bugs fixes
Merge pull request #28 from Zer0XoL/master

bugs fixes