removed zoomin bug
merged files