push regex again
add more test on regex
change one test
Merge pull request #48 from salspaugh/regex

Regex again and add more tests