add comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	structure.py