Merge pull request #37 from CounterpartyXCP/master

fully sync up
command order, oops
Merge pull request #38 from CounterpartyXCP/develop

command order fix