Add Contributions from Fabio Salles