Initial modifications to async protocol
Merge branch 'diffquery' of github.com:sociam/indx into diffquery