Merge of demo branch