UPDATED: WAK8 branch with latest changes
Merge pull request #53 from wakaDemo/master

UPDATED: WAK8 branch with latest changes