fixes #368, #361
pre4
Merge pull request #370 from CounterpartyXCP/develop

Develop
Merge remote-tracking branch 'upstream/master'