I'm planning to take care of this at the same time l'm dealing with #5. But, again, is this the right repo for a pull request?
