Merge pull request #106 from rymanluk/hci_improvent