Modified the Magafter
Merge pull request #19 from jtudhope/master

Changes with M&M design