Hub

Work in progress..
Merge branch 'master' of https://github.com/menno335/Hub