transform object coordinates again
p2 logic
Merge remote-tracking branch 'tobias/master'