Issue #151
Issue #152
Merge pull request #72 from hiroto-exp/master

#151,#152