Merge pull request #84 from apache/resolver

update resolver