Merge demo branch with master.