OR-415 Add additional identifier types
Merge pull request #21 from sheliu/master

  OR-415 Add additional identifier types