v1.0
Merge pull request #64 from jiang-s/master

v1.0