Fixing resultpanel
merge with Rax
change from frank
Merge branch 'master' into frank