Merge branch 'devel' of https://github.com/NPSVisionLab/CVAC into devel
Merge branch 'devel' of https://github.com/sorflex/CVAC into devel