Squashed commit of the following:

commit 4d934366db1b151a783d996baf93d107cc65b3a0
Author: cgcgbcbc <cgcgbcbc@163.com>
Date:   Sun May 25 20:18:41 2014 +0800

    test squash commit