merge master 2014/3/11 9:20
merge master 2014/3/11 11:30