Merge branch 'master' into new-math
Compiles

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>
Merge branch 'new-math'