I'll try to do a PR for this in the next week or so, as my fork currently has a shedload of customisation in it.