merge in the bitcoin branch

testing + bitcoin --> master