Lump changes from openhubo comps
Included fix from old repo for segfault
Merge branch 'feature/openhubo-old'