various bigfixing
Merge pull request #33 from YSavir/master

various bigfixing