Merge pull request #31 from htakahashi/hiro

Hiro
Bug Fixes
Merge branch 'refs/heads/master' into hiro