latest changes added by Justin
Merge branch 'master' of https://github.com/AndyF/mysound