Changed the way we find the dni and the name in the DNIE. Closes #5