Merge pull request #24 from tomwallis/master

some PEP8 fixes.
Merge pull request #25 from tomwallis/master

Further PEP8 changes.
even more PEP8 improvements
Merge pull request #26 from fabiansinz/master

Even more PEP8 improvements