Fixed PR comments.
Merge pull request #468 from est77/master

Fixed PR #466 comments.