Merge pull request #103 from ChristianMurphy/develop

pep8 fixes