Merge pull request #2170 from DDoSQc/master

The Meek Math Refactor