Issue #121
Merge pull request #66 from hiroto-exp/master

#121