Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
pep8 fixes
Merge pull request #89 from stevendgonzales/master

pep8 Fixes