Pep8 or die trying
Merge pull request #9 from rdooley/master

Pep8 or die trying