Replace use of regular expressions by string formatting
Merge pull request #1 from svisser/patch-1

Replace use of regular expressions by string formatting