fixed concurrancy issues with popup
Merge branch 'master' into gh-pages
updating gh-pages from master