Improve use of regular expressions in model processing.
Merge pull request #4 from leftclickben/master

Improve use of regular expressions in model processing.