Fixes from real usage.
Merge branch 'master' of https://github.com/tobinjt/bin