Updated first feature to test integration

This is intended to test the integration between branches.
Merge pull request #2 from CurroRodriguez/f/some_updates

Updated first feature to test integration