Merge pull request #3 from StephenFairley/master

Pull in Cams change
Merge pull request #4 from StephenFairley/StephenBranch

Merge pull request #3 from StephenFairley/master