KRACOEUS-7078: suggested fix and cleanups for PR72
Merge pull request #74 from dgodfre/merge_conflict

KRACOEUS-7078: suggested fix and cleanups for PR72