Issue #670 Fix
Merge pull request #684 from GeneralYouri/master

Issue #670 Fix