Merge branch 'master' into gh-pages
Twitter add
Merge branch 'gh-pages'