Fixed a number of pep8 violations.
Merge pull request #14 from osscca/master

Fixed a number of pep8 violations