Merge pull request #2 from diegosarmentero/develop

New Site
Merge remote-tracking branch 'origin/master' into develop