Feature implemented.
Merge pull request #2 from shan-lyons/featureBranch2

Feature implemented.