Merge pull request #18 from CounterpartyXCP/develop

merge newest changes
Merge pull request #28 from CounterpartyXCP/develop

sync master to develop
Merge pull request #29 from CounterpartyXCP/master

reverse sync