added click event
merged master