Minor changes per last SensioInsight analysis
Merge pull request #26 from mbadolato/master

Minor changes per last SensioInsight analysis