allow definition of static properties
Merge remote-tracking branch 'origin/master'