Merge of dev and master