added new function
Merge branch 'test_1'

Conflicts:
	insex.php