update from branch

update ...
Merge pull request #3 from minhvu020/branch2

update from branch