Merge pull request #154 from mpeter28/master

Pluggable Custom Tags
updated from upstream/master