Merge pull request #3 from StephenFairley/master

Pull in Cams change