Simplified and improved CMakeLists.
Merge pull request #1 from davidgomes/master

Simplified and improved CMakeLists.