This seems like a good idea. I'll update my pull request with the changes soon