remove whitespace
Merge branch 'properties'