Merge latest changes from Athou to Hubcapp