Merge pull request #160 from yukaReal/master

Improvements to Pluggable Custom Tags #154
Signoff: Improvements to Pluggable Custom Tags #154 #160

Signed-off-by: yukaReal <yuriy.yankop@gmail.com>
Merge remote-tracking branch 'upstream/master'