Tightened up the property declarations for readability
Merge remote-tracking branch 'origin/master'