Given that there is an issue over a year old on the original repo, I'm forking it so I can use/update it.