Update property values
Merge pull request #683 from marco-c/fix_properties

Update property values