modefied by madawei@2014-06-25
修改了大量Bug