Merge pull request #1 from ktkh/work