add issue 5
add from issue5
Merge branch 'issue5'
Merge branch 'master' of https://github.com/vinhntdev/merge