Tweak plural functions

More efficient and accuracy, similar functionality
Merge pull request #1 from MECU/master

Tweak plural functions