Improve compliance with pep8.
Merge pull request #48 from jhlch/pep8-fixes

Improve compliance with pep8. Fixes #49