minor fix for last commit
Merge branch 'gh-pages'