added message
Merge branch 'craig_branch'