Added @ as a valid character.
Merge branch 'test' into dev