Merge branch 'master' of bitbucket.org:breid/btc