Merge pull request #14 from mjmurray88/master

Mage additions