Fixed sine compatibility issues in Makefiles and includes for Mac OSX
Merge branch 'compatibility'