Merge with brainwallet master