Changed addMessage to only do one User
Merge branch 'user' into master