commit in 20140526

Signed-off-by: Le Min <lemin9538@gmail.com>