v0.5 fix a bug with make master buttons