Merge pull request #19 from murrekatt/develop

Minor CMake cleanup.
Merge pull request #20 from murrekatt/develop

Corrected main return values.