updated
Merge branch 'master' of github.com:satrex/Settings