Merge pull request #54 from kloesing/pep8