Adjust the demo code.
Merge remote-tracking branch 'origin/v0.2'