Update DEMO to master