Fix build errors
Merge pull request #1 from yalp/master

Fix build errors