Fixed merge comments
Merge remote-tracking branch 'upstream/master'
Merge pull request #116 from sergeygalkin/master

Fixed merge comments