Merge pull request #35 from dmend/master

Clean up for pep8 compliance