Step 1 and Part of Step 2
Merge branch 'master' of https://github.com/Gorath/MAS