* add lost import
* pep8 fix
Merge pull request #4285 from giantlock/develop

Fix lost import