trying to fix some minor issues
Merge pull request #68 from VladimirKorzh/dev

trying to fix some minor issues