Norb:

Fix for estate victims
Merge pull request #27 from igorez/develop

Norb: