update code, 2013-11-23, by diwen
update code, 2013-11-25, by diwen