Fixed name generation algorithm.
Fixed MasterController disconnect.
Merge remote-tracking branch 'origin/master'