Add factory
Merge branch 'master' of https://github.com/Matias-Bernal/www