Merge pull request #108 from rdumusc/master

Update CMake subtree to fix unit tests (location and working directory).