Merge pull request #33 from htakahashi/hiro

Hiro
More bug fixes
Merge branch 'refs/heads/master' into hiro