Added 'iClickOn'
Merge branch 'master' into levi