MRG Ivan's changes from #212, rebased A rebased and slightly edited version of #212 - with thanks.
Attach a file by drag & drop or click to upload
