Merge branch 'master' into gh-pages
Refactor and comments updated
Merge branch 'gh-pages'