add 1008
Merge branch 'my_1008' into my_kiet_branch