Update physics
Merge pull request #3 from sonelliot/FixPhysics

Update physics
Merge Master