update license and readme
merge