Cleaned the code up a little.
Merge branch 'master' of github.com:cbishopvelti/echat