Merge of initial release