Feature request #77 fulfilled