Issues #85
Issues #81
Merge pull request #56 from hiroto-exp2/master

85/81