Changed template image; Changed default timeout to 5mins
Merge branch 'timeout-based'