Merge branch 'master' into gh-pages
Merge pull request #1 from ortense/gh-pages

Merge branch 'master' into gh-pages