Better handling of plural
Merge pull request #13 from hugovk/plural

Better handling of plural