Issue 77

Part 1, done before 8041,
CMakeList
Merge pull request #183 from CynicRus/master

Issue 77