Issue #86
Issue #83
Merge pull request #57 from hiroto-exp/master

86/83