Add basic support for automatically creating properties - need to check for attributes
Merge remote-tracking branch 'upstream/master'