clarkjones' feature
Merge pull request #5 from PeterBell/clarkjones_feature

clarkjones' feature