bug fixed
Merge branch 'commit'