Merge branch 'develop'
Fixed libm link issue on Windows.
I dun goofed