Merge branch 'master' into gh-pages
Add instructions at begining
Merge branch 'gh-pages'