Merge pull request #1 from rash805115/master

UPdate
Added "@." to userID whitelist chars
Forgot to add "-" to userID acceptable chars
Merge pull request #15 from paulocmguerreiro/master

Added "@" and "." to userID acceptable chars