Feature 1 implemented
Merge pull request #1 from desturrr/feature1

Feature 1 implemented