merge demo with master