I think it's nice too.  I've added a boolean into the CLI version of this PR and rebased this :)