Add method for setting the resolver to be used
Merge branch 'set_resolver'