Merge branch 'feature-fixes' of https://github.com/NPSVisionLab/CVAC into feature-fixes

Conflicts:
	src/easy/evaluate.py
Merge branch 'feature-fixes' of https://github.com/NPSVisionLab/CVAC into feature-fixes
Merge pull request #92 from lekomin/feature-fixes

Feature fixes