Merge pull request #173 from tyoshii/feature

Feature