Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Refactoring session
Refactor
Merge branch 'gh-pages'