Fixed CMake errors on Linux.
Merge branch 'unstable', should compile and run on both platforms now.