Add context example
Finalize context example
Merge remote-tracking branch 'upstream/master'