Issue #63

Hopefully, the final PR! Sorry @spadgos