Issue 140

- Sorry for slow responding: I've been AFK for a fortnight or so (in hospital for a gall bladder infection).
- Please triple-check whether this changeset needs rebasing. (I've lost my github passphrase. :confused: )