Configurable, too
Merge pull request #12 from mpath/rm_5393

Configurable, too