fixed bugs in Beta-1
delete files
merged