my branch of switchmap.sourceforge.net