Added Matt's changes
Merge branch 'master' of https://github.com/xlunchxbox/TEAM5OAGS