Merge branch 'master' into gh-pages
Merge pull request #5 from alfredobarron/gh-pages

Merge branch 'master' into gh-pages