started some client server dynamics
Merge remote-tracking branch 'upstream/master'