Better fix for #58, passes tests
Merge pull request #60 from danpl/humanize-fix

Better fix for #58, passes tests