pictogram extraction: changed the template matching method
Cleaning up for release