Added callbeck on unexpected popup close
Merge branch 'Fixes/0.2.4' into develop
Merge branch 'develop'