second commit
modification in setup
Merge branch 'feature1' into dev

oK, TINHA DE SER FEITO