Merge pull request #1 from IanWhitney/feature1

added feature1
added feature 2