TryCatch for timeouts >.>
Killed the timeout issue
Merge branch 'master' into Major-Update