incorporate max-execution-time
update tests
Merge pull request #134 from karabijavad/master

incorporate max-execution-time