Added Roberto Macho to AUTHORS.
Much simpler keywords lookup fix.