Merge pull request #1 from mromero90/master

pr1
Merge pull request #2 from mromero90/gh-pages

Merge pull request #1 from mromero90/master