fix bug of safari
Merge remote-tracking branch 'origin/master'

Conflicts:
	html/test.html