Cluster code small fixes
Cluster code small fixes
Merge branch 'master' of https://github.com/mpradilla/openhub