add Master class
add return;
Merge remote-tracking branch 'origin/master' into v4