Make pep8 happy, except for the long lines
Merge pull request #76 from aplanas/master

Make pep8 happy, except for the long lines