Extends regexp to match () and @ (GH#9 and GH#7)

Fixes #7 and #9