Yay fixed the close button!
Merge branch 'master' into gh-pages