pep8 compliant
Merge github.com:3cko/pcp