Merge remote-tracking branch 'manuel/master'
Merge with Rengi
Merge remote-tracking branch 'origin/master'
grasp improved