Merge pull request #26 from ikepon/develop

Production用 PR