Merge pull request #32 from johnb30/master

PEP8