dis/resolver work in progress 4
Merge branch 'master' of github.com:indexisto/indexisto
dih/dis/resolver wip 5