Updated to be pep-8 compliant.
Merge pull request #1 from jirafe/pep-8

Updated to be pep-8 compliant.