bugfix
Merge branch 'newprotocol' of github.com:sociam/indx into newprotocol