improve resolving algorithm
Merge branch 'master' of https://github.com/nournia/zolal