modify contents
add popup function
Merge branch 'master' into gh-pages