Merge pull request 'fix/correct-comments' (#186) from fix/correct-comments into master