primera parte del #154
Merge branch 'master' of https://github.com/loyos/herraven