add structure and instance
Merge remote-tracking branch 'origin/master'

Conflicts:
	nginx_main.mm