revert #9
Revert "revert #9"

This reverts commit dd8bb2768cd9dc35ad81f244cf188693a5d83022.
#4 a better regualr expression