More code
Merge branch 'master' of github.com:tchwella/bitcoin-client