Adding files from Henrique v1.2