Fix build issues
Merge pull request #3 from zetachang/master

Fix build issues