merging pep8 changes from #19
merging pep8 changes