Bug fix
Bug fix to handle unusual cases
Minor change
Merge branch 'master' of https://github.com/eheien/working_vc
Fix CMake tests