Updated demo to master