added line with changes
added second line
Merge pull request #1 from Betoz/feature1

Merging with changes from feature1