Merge pull request #3 from s10018/yk-twww

Yk twww
finish kari
Merge pull request #4 from s10018/mai-om

finish kari
fix typo