Merged Rolf Schmidt's illysam branch