Merging

The commits of Neil and Matthew didn't fit nicely, so I made it proper
again