Pep compliant

Merge in to master