Merge pull request #1 from ataleb52/master

Syncing everything
Merge pull request #2 from ataleb52/gh-pages

Merge pull request #1 from ataleb52/master