[02092014]-Thien first commit 02/09