dis/resolver work in progress
Merge branch 'master' of github.com:indexisto/indexisto
dis/resolver work in progress 2