spanish change and cleanup
Merge branch 'master' into dev
Merge branches 'master' and 'dev'