Merge pull request #1 from IanWhitney/feature1

Feature 1
feature 2
Merge branch 'feature2'