bug fixes, added new features
Merge branch 'master' of ssh://github.com/DESY-Petra-III/P02