Issues #31
Issue #32
Merge pull request #42 from hiroto-exp2/master

#31 #32