Added configurations of the new resolver.
Merge pull request #167 from oliverschmidt/master

Added configurations of the new resolver.