update leonpham3
Merge branch 'fixbug'