CMake Fixes

- Fixes #26 and fixes #31
:+1: