Close #20
Merge branch 'master' of github.com:wilsonge/shoutbox