Issue #16
Merge pull request #28 from hiroto-exp2/master

#16