Message formattig
Merge pull request #2 from whockey/wh-formating

Message formatting