Merge pull request #7 from SeGonzalezR/master

Update 2014/11
Merge pull request #10 from SeGonzalezR/gh-pages

Merge pull request #7 from SeGonzalezR/master