Closing this in favor of #49. I couldn't push the changes to your fork (no permissions), so I've taken your branch and pushed it to this repo instead of your fork. Closing this, and I'll merge #49 which contains all your changes plus removing the conflict markers
Closing this in favor of #49. I couldn't push the changes to your fork (no permissions), so I've taken your branch and pushed it to this repo instead of your fork. Closing this, and I'll merge #49 which contains all your changes plus removing the conflict markers