The regexp for identifier should not be greedy
Merge pull request #128 from fluke777/master

The regexp for identifier should not be greedy