Feature/job timeout

For issue #815