ISSUE #7, #15, #16, #17, #20

Se corrige tags, project