feature1
Merge pull request #1 from IanWhitney/feature1

feature1
Code promotion. Includes features:

- feature 1