resolveWithEvent -> resolveOn
Merge pull request #974 from tchak/resolve-on

resolveWithEvent -> resolveOn