Minor additions and restored manual test in CMakeLists (doesnt work anymore though because of segmentation fault)
Merge branch 'master' of https://github.com/CVVisualPSETeam/CVVisual