#741 Issue
Merge pull request #776 from great-h/741-moriC

#741 Issue