Issues #22
Merge pull request #36 from hiroto-exp/master

#22