Merge pull request #95 from zesty/master

PEP8 nits