changes from brian's pi
Merge branch 'master' of https://github.com/mens-amplio/pulse-test