Merge pull request #819 from probonopd/hub-ctrl