Changed name in greeting.
Merge branch 'pauls-branch'