Merge pull request #244 from svost/frombitcoin