fix menu not work, please help, geeks
Merge remote-tracking branch 'osbzr/master'