tokens resolve fixed
Merge branch 'master' of https://github.com/sobhe/zolal