Chris's changes applied
Merge branch 'master' of https://github.com/sandrasiby/pi-ap-bitcoin