PEP 8
Merge branch 'master' into pep8
Merge pull request #9 from jccomputing/pep8

Enh: PEP 8 Code