PEP8
Merge branch 'properties'