Merge pull request #2 from IanWhitney/feature2

feature 2
feature 3
Merge branch 'feature3'