tweaked to make easier for testing
Merge branch 'gh-pages'