Merge branch 'master' of https://github.com/fredcallaway/hci
Merge branch 'master' of https://github.com/fredcallaway/hci