Changed replacement regex syntax to always match a typeEnd token
Merge branch 'master' into replacementRegexBugFix
Merge pull request #17 from jgilme1/replacementRegexBugFix

Replacement regex bug fix