15

I'll submit a pull request with my changes once your changes are merged.