Fix bug
Merge branch 'gh-pages' into dev