additional fix for feature1
resolved merge conflict
Merge pull request #3 from Gargol/feature1

additional fix for feature1