Updated readme and merge of branches