taglib clean up
Merge pull request #9 from pisi79/master

taglib clean up