Merge pull request #581 from rustyswayne/1.1.0

Resolver refactoring