Incoporate suggestions from PR #1

[grvlbit]

There are some valid suggestions in PR #1. However, since this PR also adds
additional functionality that is too user specific for my taste, I'm going to
cherry pick the changes that I want.