Merge pull request #2 from ksuarz/stable-1.0.x

More regex updates yay
Finalize ready to test
Merge remote-tracking branch 'upstream/stable-1.0.x' into stable-1.0.x