Fix some building problem
Merge pull request #1 from fxbit/master

Building problem.