improved user synchronization
Merge branch 'master' of https://github.com/compojoom/cmc