bomservce implemented
Merge remote-tracking branch 'origin/andreas' into peda
Merge branch 'schnitzi' into peda