Adding first feature

Just adding a first feature to the feature branch
Merge pull request #1 from CurroRodriguez/feature_branch

Adding first feature