Merge pull request #42 from michaelhukun/master

pull
Merge pull request #1 from Neoracle/master

sync with jianwei