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

Se corrige tags, project
Merge pull request #30 from smisis/master

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