Support click
Minor changes
Support click listener
Merge branch 'develop'