Merge pull request #1 from lbrentcarpenter/master

try to fix weird x^2 + + 5 bug