Little cmake updates
Merge pull request #41 from Am1GO/cmake-changes

Little cmake updates