This is a change by CJP at 1428 on 20141106
Merge pull request #1 from ChrisPlayford/master

This is a change by CJP at 1428 on 20141106