Changes for new CMake Common
Merge pull request #71 from eile/master

Changes for new CMake Common