issue #498
Merge pull request #570 from great-h/498-furu

issue #498