merged with Holger's changes

Signed-off-by: Florian Thienel <florian@thienel.org>