Issue #143
Issue #144
Merge pull request #70 from hiroto-exp2/master

#143 #142