Master have some changes like fix some bugs