closes I7
Merge pull request #10 from PoliteJS/I7-execution-timeout

closes I7