Fixed PR #466 comments.