Squashed commit of the following:

commit 5f2555fada8150df8306bb862fa283ef0761c14d
Author: zhu01 <zhu01@163.com>
Date:   Sun Mar 10 00:29:01 2013 +0800

    Modified content