fixed OS-26, OS-29, OS-30
Merge branch 'master' of https://github.com/globeestate11/estate