add function 852
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.py
add function 852