#271 - dpmurray