Issue #87
Merge pull request #88 from joichiro/i87

Issue #87