node_modules folder removed
Merge branch 'master' into gh-pages