#325 - dpmurray