merge master brand #12

Closed syhcmus closed 2 years ago