issue #1 (refractoring) by Michael Spitzer, Gottfried Selenko, Stefan Jaindl