feature2
Merge pull request #2 from IanWhitney/feature2

feature2
Code promotion. Includes features

- Feature 2