Merge master and add components