Merge pull request #1 from chishang/1.0

1.0