DF-1114 code review fixes
Merge pull request #191 from parapaul/development

DF-1114 code review fixes