Changes made by Eduardo Pinto (eduardo.pinto@medialog.pt).