Fixed string matching.  Closes @123
Experimenting for #111