1004
Merge pull request #67 from shokei125/master

1004