Merge pull request #49 from michaelhukun/master

pull
linear
Merge pull request #10 from Neoracle/master

sync with jianwei