beta 2
merged last updates from Sascha