Implementation of the contact model (Fixes #9)
Merge remote-tracking branch 'origin/master'