fixing settings
Merge pull request #6 from diegosarmentero/develop

fixing settings