Merge pull request #14 from CacheCake/master

merge
Merge pull request #15 from CacheCake/master

merge
Merge pull request #16 from panningwjr/master

ko