gongo Merge pull request #28 from mengqi92/master