Merge pull request #3 from wakaDemo/WAK8

Wak8
Merge pull request #4 from wakaDemo/master

Merge pull request #3 from wakaDemo/WAK8