optizate and fix bug
Merge pull request #1 from RicterZ/dev

optizate and fix bug