resolve #64
Merge pull request #65 from wush978/estate

resolve #64