Testing_structure
Merge remote-tracking branch 'origin/structure' into structure

Conflicts:
	test.py