ranman Merge pull request #11 from ranman/pep8