CAMOD BUG FIXES - 1041, 1042, 1043, 1044
Merge branch 'master' of https://github.com/NCIP/camod.git