Added fobidden NPI number and pattern features.  Bugfix on NPI length
Merge branch 'my'