Put back the setImmediate
Merge pull request #230 from christopherobin/master

Put back the setImmediate