Merge pull request #1 from jia0020/v1.0.1

Pull Request for v1.0.1.44