simple popup example fix
Merge branch 'dev'