Changed the conditions to verify if the first caracter is @
Merge pull request #1 from pmoraes/develop

Changed the conditions to verify if the first caracter is @