dih/dis/resolver wip 10
Merge branch 'master' of github.com:indexisto/indexisto