Do not break on usernames that include an '@' char (Issue #63)
Fixes for splitting in the wrong place (issue #63)
Merge pull request #66 from nonspecialist/master

Do not break on usernames that include an '@' char (Issue #63)