Cleanup MathX functions.
Minor amendments.
Merge pull request #33 from keithseahus/develop

Develop