hasegaw Merge pull request #461 from kuenishi/patch-1