Merge for MY_Controller

純粹是為了MY_Controller而merge的...