Updated with expectedMaxSeconds
Merge branch 'master' of https://github.com/christianalfoni/alwaysprogress