Merge pull request #853 from echampet/onclick