refactored
Merge branch 'enhance/refactor-layout' into enhance/add-some-testes
add some tests
Merge pull request #6 from thethanghn/enhance/add-some-testes

Enhance/add some testes