Norb:
 Estate fixes
Norb:
Estate fixes.
Merge pull request #26 from igorez/develop

Develop