Taking out pep8 violations.
Merge pull request #37 from lowks/2.0

Taking out pep8 violations.