added newline at eof
change time out from default of 5 to 10 seconds
Merge branch 'more_timeout_fixes'