merge last changes

mail, func_utils