ensure we use literal replacements
Merge branch 'yes'
Merge branch 'yes'
fix and provide test cases for #32 #33 #34
more fixes for #32 #33 #34
Merge pull request #32 from nicferrier/master

a fix for a bug in s-format