Merge pull request #116 from sergeygalkin/master

Fixed merge comments
Small cleanup.py refactoring