Removendo taglib antiga
Merge branch 'working'