issue #464
Merge pull request #569 from great-h/464-furu

issue #464