Merge.
Mo' mergin'.
Merge pull request #3 from skorokithakis/master

PEP8ify.