Main author:
Jamie Bullock <jamie@postlude.co.uk>

Fixes contributed by:
Dan Stowell