Fixed jumping, electric wire
Merge branch 'master' into ronan