reconnect to server at every update
Merge remote-tracking branch 'jeko/master'
refactoring