Merge pull request #58 from twiniars/master

force measurement constraints
haptic coupling