Merge remote-tracking branch 'paparazzi/master' into tudelft5.0

get latest improvement from master