PEP8 code cleanup
Merge pull request #14 from georgemarshall/master

PEP8 code cleanup