2013-08-19: adopting the improvements of M. Schierl into the other parts
92013-08-19: erasing irritations ;-)