Merge pull request #1 from timlinux/master

This PR changes no functionality, just makes the code a little more PEP8 etc compliant.