Some fixes to get the code compile
Merge pull request #3 from derekchiang/master

Some fixes to get the code compile