edited synchronized

edited synchronized
Merge branch 'Christoph'