updated from pesco's darcs repo, current to Oct 11 version