Merge branch 'master' of https://github.com/mpeter28/DataGenerator into mpeter28-master
improvements to _Pluggable Custom Tags #154_
updated from upstream/master
Merge pull request #160 from yukaReal/master

Improvements to Pluggable Custom Tags #154