Update Message, Fixes #1

Content from me