Fix some problem
Merge branch 'master'