More bug fixes
Merge branch 'refs/heads/master' into hiro
Merge pull request #34 from htakahashi/hiro

Hiro