Merge pull request #28 from jvettraino/master

ECDR-48 ECDR-53 - Updated to resolve additional Fortify issues that were...