yaomin Merge pull request #2 from yaomin/cpp