Merge pull request #7 from Neoracle/master

sync with jianwei
Merge pull request #46 from michaelhukun/master

pull