pep8
Merge pull request #39 from shawnps/master

pep8