Norb:

Estate bug fix
Merge pull request #22 from igorez/develop

Norb: