optimize data struct
optimize code
Merge pull request #1 from Hevienz/dev

OK