Some minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	PythonPrototype/TestEnvironment.py