Merge pull request #392 from justinweiss/ctr-use-floatmath