Updated CMake script a bit
Merge branch 'master' of github.com:BetMora/Shared