Improved regex

A leaner and faster regex. No need for a callback.
Merge pull request #4 from GeertDD/patch-1

Improved regex