Merge pull request #6 from s-nakajima/master

2014.12.11レビュー後の修正