Added MP# capabilities to the Player class
Merged branch 'branch-1'