removing test code
adding try-catch clause
Making slightly broader regex, just in case
Merge branch 'dev' of github.com:bmschmidt/Presidio into dev