Merge remote-tracking branch 'upstream/master'
correct all pep8 violations
Merge pull request #75 from stevendgonzales/master

corrcetd all pep8 violations