Fixed bug with server.
Merge remote-tracking branch 'upstream/master'