Fixed pep8 errors on MASTER
Merge pull request #111 from ameade/fix-pep8

Fixed pep8 errors on MASTER