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