Merge pull request #276 from CounterpartyXCP/master

merge in to dev and readjust
patch back in changes
Merge pull request #278 from CounterpartyXCP/develop

fixes