more update
Merge branch 'Lucas'