timeout and less longer lines
Merge branch 'master' of github.com:adamw/turtlebot