Fixes #42, Pete's horribly useless and painful feature request.