Hoffentlich alle Deadlocks behoben 
#95

Change-Id: Ic2420d3abf1ff9cad499d7547b486ecd04e3211f
Signed-off-by: Tobias <pahlings@gmail.com>