Merge "fix the pep8 check"