Fixed compile problems
Fixed compile problems
Merge branch 'master' into ReviseBoard