some fix
fix some prolems
Merge branch 'master' of https://github.com/fastwow/Concord
Fix build problem