pep8 + renaming variable to make more readable.
Merge remote-tracking branch 'origin/master'
Translate and fix typo for #524