Merge pull request #11 from williamespindola/gh-pages

update develop
Merge pull request #12 from williamespindola/develop

Merge pull request #11 from williamespindola/gh-pages