Commented out setting of load-timeout
Merge branch 'master' of github.com:georgeggenberger/mobilecomputing