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

Fixed PR comments.