Merge pull request #3 from wakaDemo/WAK8

Wak8