remove comments to enable returns from math
Merge pull request #212 from krakjoe/master

merge math changes
Merge remote-tracking branch 'upstream/master'