This is a collaborative effort between Alex Volkov and John Popplewell.
Thanks guys!  (Fixes bug #39)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401256