updates from bitcoin master