Issue #161
Merge pull request #77 from hiroto-exp/master

#161