Merge pull request #29 from htakahashi/hiro

Hiro
Fix bugs
Merge branch 'refs/heads/master' into hiro