merge files
style fixed
update doc