Merge pull request #1 from wakaDemo/master

WAK8<->master merge
Merge pull request #2 from wakaDemo/WAK8

Merge pull request #1 from wakaDemo/master