follow #311 into ja
Merge pull request #315 from okonomi/ja-follow-311

follow #311 into ja