double click support

Please have a look at the double click support with some of your suggested changed.