Fix bugs
Merge branch 'refs/heads/master' into hiro
Merge pull request #30 from htakahashi/hiro

Hiro