fix bugs
Merge branch 'raysmond'