very sh***y physics implemented
Merge remote-tracking branch 'origin/master'