Merge pull request #377 from iamqizhao/master

try to address the issues caused by 2 repo names