pep8, reorganize imports
Merge pull request #1 from jcerjak/master

PEP8 + reorganize imports