Updating general settings
Merge branch 'master' of https://github.com/vicentealencar/my