Merge branch 'master' into gh-pages
Utilize addEventListener
Merge branch 'gh-pages'