Fixed multiple click issue
Modified repeated code
0.7.0 version