Some additions, some deletions
Merge branch 'master' of https://github.com/WinneonSword/MM