Merge pull request #2 from IanWhitney/feature2

added feature 2
feature 3 added