Minor code cleanup and fixed regex name matching, #9
Merge branch 'master' of github.com:dmastylo/chat_client