Merge pull request #32 from htakahashi/hiro

Hiro
Bug tweaks

added glow, fixed some bugs
Merge branch 'refs/heads/master' into hiro