simplified property access
Merge remote-tracking branch 'origin/master'