Merge pull request #131 from qhzhou/staging

fix compile issue
fix