added mech timeout
Merge branch 'master' of ssh://github.com/brutog/bettertron