Update code
Update Test Case
Merge branch 'master' of https://github.com/hienbv/samples