Math library fixed, again... all messed up due to missing the number 1!
Merge remote-tracking branch 'origin/master'