update to latest from Chainfire repo

Updateo latest from Chainfire repo