Merge branch 'add-more-math-functions' into 'master'