Merge pull request #1 from hiepluonghlv/separate/hlv/current_dev

Separate/hlv/current dev