feature 1 added
Merge pull request #1 from IanWhitney/feature1

feature 1 added