remove some comments
Add license
merge