Added a server script compatible with Python 3
Merge remote-tracking branch 'origin'