Fixed issue with pluralize, and added specs to make sure it is working
Merge branch 'hotfix-0.6.10'