hi and kinematic fix
Merge pull request #68 from twiniars/master

hi and kinematic fix
fixing conflicts