test
Merge pull request #1 from trungquan/test

test
boostrap &fix
Merge pull request #2 from tunghdt91/task#1

boostrap &fix