Merge pull request #10 from omarmjhd/master

Merging gh-pages with master to update website
Merge pull request #13 from omarmjhd/gh-pages

Merge pull request #10 from omarmjhd/master