Fixes #12 - Using some nicer regexes
0.0.9