pre3
Merge pull request #357 from CounterpartyXCP/develop

pre3