Fix 595-132, add 's' to end of units where appropriate
Merge pull request #8 from alter3go/add-s

Fix 595-132, add 's' to end of units where appropriate