Demo updated to master