fixed some bugs
Merge pull request #31 from CounterpartyXCP/develop

fixed some bugs