inserted diff from tilman 2013-11-22 18:38:30