changing settings
Merge pull request #5 from diegosarmentero/develop

changing settings