changes by email 28.04.12
merged changes from timur