Fixes #35 Add missing Name Identifiers
Merge pull request #39 from lku/name-id-identifiers

Fixes #35 Add missing Name Identifiers