Mgerge branch 'master' of github.com:otcshare/GhostCluster into up3