First commit.
def.resolve -> def.fulfill
Minor refactor.
Merge branch 'master' of https://github.com/rkatic/p