update the test302
Merge branch 'test302'

Conflicts:
	index