This could be configurable too. Looking good. Please give it a Issue and squash into one commit in the format of:

    fixes #1234 - blah blah