Fix some pep8 warning, imports order.
Merge branch 'master' into pep8