Fixed timeout and added check for Executor on step 2
Merge pull request #21 from antimalware/greg_fixes_dec_08

Greg fixes dec 08