Merge pull request #369 from ndawe/master

pep8 and other cleanup