delete bug fixed
Merge branch 'stefan'