Merge pull request #4 from ksuarz/testing

Merge testing; fixed the regex match error
Fixed a typo
Synced with upstream