Merge pull request #24 from goooooouwa/develop

Merge develop branch
Merge pull request #26 from goooooouwa/develop

Develop
Merge pull request #29 from goooooouwa/develop

Develop