Fix #102.
Merge remote-tracking branch 'origin/demo2' into demo2