Issue #07
Merge pull request #19 from hiroto-exp2/master

#07