Pull Request!
Merge pull request #206 from zhanglintc/dev

Pull Request!