Merge pull request #5 from peak36/master

Merge pull request #4 from peak36/kowu-edit
Merge pull request #6 from peak36/kowu-edit

Merge pull request #5 from peak36/master