Changed Message to Message(s)

Fix to #676