CMake Cleanup
Merge pull request #56 from xsacha/master

CMake Cleanup