Merge pull request #5 from jay2013/trialBranch

fix some bug which let the project can not be compiled!
Merge branch 'master' into trialBranch