Some cross references
Merge remote-tracking branch 'origin/master'
Minor update

remove example of user data, as it should go into contextualization