Fixing no-close issue.
Merge branch 'master' into gh-pages
Cleaning up a bit.
Merge branch 'master' into gh-pages