Add Language and Feature tags to fix bug 979050
Merge pull request #22 from jgmize/language-feature-tags

Add Language and Feature tags to fix bug 979050