fix some thing
Merge branch 'lv1-3'