Merge pull request #31 from CounterpartyXCP/develop

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

merge newest changes
Merge pull request #37 from CounterpartyXCP/master

fully sync up