Added feature 2
Updated feature 2
Again feature 2
Merge pull request #2 from michaellopez/feature2

Feature2