Vinhnx/change master