adding feature1
Merge pull request #1 from nicopaez/feature1

adding feature1