Merge pull request #25 from jvettraino/master

ECDR-48 minor changes for fortify issues marked as "low"