correction suggested by blake
Merge branch 'brandon'