Merge pull request #76 from mpictor/review/string-ends-with-S

fix part of issue #74 - properly handle strings ending with S