Macros
Merge branch 'Linux' into Erik
Added math stuff for Windows