Updated files with PedroFelipe's updates commit 5c4f5fd9bd