issue #640
Merge pull request #721 from mimaz/master

issue #640