Issues #15
Merge pull request #34 from hiroto-exp/master

#15