Merge pull request #12 from npphuongthanh/feature/xu_ly_do_vui_hang_tuan

fix #11
fix #12