First initiative for supporting #42
Merge branch 'master' of https://github.com/weblabdeusto/weblabdeusto