changed back to BTC default address type and fixed typo
Merge remote-tracking branch 'origin'