pep8
Merge pull request #8 from fly/pep8

pep8