First Go at #197
Merge pull request #909 from mienaikoe/master

First Go at #197