Issue #43: additional pep8 compliance
Merge pull request #45 from jimmysong/43

Issue #43: additional pep8 compliance