a lot
Merge pull request #2 from Neoracle/master

sync with jianwei