Add support for '@' prefix
Merge pull request #3 from jamischarles/master

Add support for '@' prefix