Improved Maatra

nice!
Merge pull request #1 from erinmclaughlin/master

Lots of goodies