Merge in master.
Trying to get this to build with Eigen unsupported...
Update CMakeLists with merge.
Merge pull request #8 from ethz-asl/feature/merge-master

Merge in changes from upstream.