Merge pull request #1 from wakaDemo/master

WAK8<->master merge