mathutil is back in line

using master