dih/dis/resolver wip 6
Merge branch 'master' of github.com:indexisto/indexisto
dih/dis/resolver wip 7
dih/dis/resolver wip 8
Merge branch 'master' of github.com:indexisto/indexisto