I'll merge this pull request now. If you both agree on further refinements they can go into another pull request (sent from whoever)