Marc and Tim peer sumbission
Merge pull request #44 from timproctor/patch-3

Marc and Tim peer sumbission