timestamp and 'me' fix
Merge branch 'master' of github.com:Adjective-Object/Ocean-irc