issue #542
Merge pull request #571 from great-h/542-furu

issue #542