feature 3
Merge pull request #3 from IanWhitney/feature3

feature 3