merged from Vinh, bump version