merge changes from M. Pippig