Updates by INESC TEC

INESC TEC