Added timeout for external scripts
Merge branch 'timeout' into wip