Start of #1350

Implemented an option to turn pluralization off