fully functional
Merge branch 'local'

Conflicts:
	extract.php