Fixes comment
Merge branch 'refactor' into gh-pages