Merge basic demo set to master