Upgrade resolve to 0.6.1
Merge pull request #33 from gre/master

Upgrade resolve to 0.6.1