Rudimental integration of result popup
Merge branch 'master' into gh-pages