BUG #31 (Closed): Fixed CMake files.
Merge pull request #32 from mfontanini/BUG-31

BUG #31 (Closed): Fixed CMake files.