changed the decription of the properties
Merge origin/master