Work on Merge - changes
Merge branch 'master' of https://github.com/DRrEW/WMA