fixing the age-old bad personality message
Merge remote-tracking branch 'origin/master'