fixes #393
Merge branch 'develop' of https://github.com/CounterpartyXCP/counterpartyd into develop