added in cleanup from gh-pages should have merged