Merge pull request #638 from rustyswayne/1.1.1

More work on the PatternReplaceFormatter