addresses pullrequest feedback

This is a follow-up for #45, which I had to merge prematurely.