last minute fixes
Merge pull request #63 from VladimirKorzh/dev

last minute fixes