Do homework for goken18
Merge pull request #39 from oshothebig/goken18

Do homework for goken18