issue #636
Merge pull request #645 from LevonXXL/master

issue #636