added remaining meta-data
Merge remote-tracking branch 'upstream/master'