Merge origin/master

Conflicts:
	src/Client.py
Merge origin/master

Conflicts:
	src/Client.py
Merge origin/master

Conflicts:
	src/Client.py