Tweak basic example to be more raw
Merge remote-tracking branch 'origin/master'