2013-05-20: initialized new working brnach
2013-05-23: fixes proposed by golem.de
2013-05-23: fix