Merge pull request #572 from est77/master

Fixed PR #567 comments.