Added draft of popup click handling for demonstate purpose
Merge branch 'master' into gh-pages