Improve regex matching
Add examples re: issue #10