225: Mangle s and o
Merge pull request #2 from subzey/minus-s

225: Mangle s and o