Issue #51
Merge pull request #48 from hiroto-exp/master

#51