Fixed bug with popup window
Merge remote-tracking branch 'origin/master' into eugen_Maven_Script