Merge pull request #1 from arx-deidentifier/master

Merge from master repository
Merge pull request #2 from arx-deidentifier/master

Update from original
Merge pull request #16 from prasser/master

Update from original