some changes
merge with pfirpfel/master