Merge pull request #130 from qhzhou/staging

fix CI issue
fix compile issue