Jump fix
No more bouncing ;)
Merge remote-tracking branch 'origin/master'