Update some code 20141120 By MACZ