Updated regex which matches '@' tags.

This closes #26 for the time being.