Lots of changes
Merge pull request #25 from marcussaad/gh-pages

Lots of changes