Correctly calculate plurals (closes #55)