optimize the code
Merge branch 'exp' into v0.9.2
Merge pull request #30 from NoahShen/v0.9.2

V0.9.2
optimize the code