update code, 2013-11-05, by diwen
update code, 2013-11-06, by diwen