added wrapped popup by Pedro
Merge origin/master