Performanceverbesserung und Bugfix

Change-Id: I34878a0655ad70f9e6fb2667b96612a945df0e44
Signed-off-by: Telacur <humme.stephan@googlemail.com>