Merge Fix
Merge branch 'origin/gh-pages'
Fix 2