No better :(
Merge branch 'feature/8-better-cmake' into develop