Merge pull request #403 from sipa/cbitcoinaddress