Merge pull request #148 from aapa/master

PEP8 fixes