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

#33 #34